hqmf2js 1.3.0 → 1.4.0

data/test/unit/js_object_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 require 'hquery-patient-api'
 
-class JSObjectTest < Test::Unit::TestCase
+class JSObjectTest < Minitest::Test
 
   def setup
   end
@@ -17,7 +17,7 @@ class JSObjectTest < Test::Unit::TestCase
     criteria = HQMF::DataCriteria.from_json(nil, JSON.parse(File.read(File.join('test','fixtures','json','data_criteria','specific_occurrence.json'))))
     expected = "hqmfjs.initializeSpecifics = function(patient_api, hqmfjs) { hqmf.SpecificsManager.initialize(patient_api,hqmfjs,{\"id\":\"\",\"type\":\"ENCOUNTER_PERFORMED_INPATIENT_ENCOUNTER\",\"function\":\"OccurrenceAInpatientEncounter1\"}) }"
     result = js.js_initialize_specifics([criteria])
-    result.must_equal expected
+    assert_equal expected, result
   end
 
   def test_to_js_without_codes

data/test/unit/library_function_test.rb

@@ -1,7 +1,7 @@
 require_relative '../test_helper'
 require 'hquery-patient-api'
 
-class LibraryFunctionTest < Test::Unit::TestCase
+class LibraryFunctionTest < Minitest::Test
   
   def setup
     @context = get_js_context(HQMF2JS::Generator::JS.library_functions)
@@ -10,57 +10,57 @@ class LibraryFunctionTest < Test::Unit::TestCase
 
 
   def test_library_function_parses
-    @context.eval('hQuery == undefined').must_equal false
-    @context.eval('typeof hQuery.Patient').must_equal "function"
-    @context.eval('typeof allTrue').must_equal "function"
-    @context.eval('typeof atLeastOneTrue').must_equal "function"
+    assert_equal false, @context.eval('hQuery == undefined')
+    assert_equal "function", @context.eval('typeof hQuery.Patient')
+    assert_equal "function", @context.eval('typeof allTrue')
+    assert_equal "function", @context.eval('typeof atLeastOneTrue')
   end
   
   def test_all_true
-    @context.eval('allTrue(1,null,null,new Boolean(false),new Boolean(false),new Boolean(false))().isTrue()').must_equal false
-    @context.eval('allTrue(1,null,null,new Boolean(false),new Boolean(true),new Boolean(false))().isTrue()').must_equal false
-    @context.eval('allTrue(1,null,null,new Boolean(true),new Boolean(true),new Boolean(true))().isTrue()').must_equal true
-    @context.eval('allTrue(1,null,null)().isTrue()').must_equal false
+    assert_equal false, @context.eval('allTrue(1,null,null,new Boolean(false),new Boolean(false),new Boolean(false))().isTrue()')
+    assert_equal false, @context.eval('allTrue(1,null,null,new Boolean(false),new Boolean(true),new Boolean(false))().isTrue()')
+    assert_equal true, @context.eval('allTrue(1,null,null,new Boolean(true),new Boolean(true),new Boolean(true))().isTrue()')
+    assert_equal false, @context.eval('allTrue(1,null,null)().isTrue()')
   end
   
   def test_at_least_one_true
-    @context.eval('atLeastOneTrue(1,null,null,new Boolean(true),new Boolean(false),new Boolean(false))().isTrue()').must_equal true
-    @context.eval('atLeastOneTrue(1,null,null,new Boolean(true),new Boolean(true),new Boolean(true))().isTrue()').must_equal true
-    @context.eval('atLeastOneTrue(1,null,null,new Boolean(false),new Boolean(false),new Boolean(false))().isTrue()').must_equal false
-    @context.eval('atLeastOneTrue(1,null,null)().isTrue()').must_equal false
+    assert_equal true, @context.eval('atLeastOneTrue(1,null,null,new Boolean(true),new Boolean(false),new Boolean(false))().isTrue()')
+    assert_equal true, @context.eval('atLeastOneTrue(1,null,null,new Boolean(true),new Boolean(true),new Boolean(true))().isTrue()')
+    assert_equal false, @context.eval('atLeastOneTrue(1,null,null,new Boolean(false),new Boolean(false),new Boolean(false))().isTrue()')
+    assert_equal false, @context.eval('atLeastOneTrue(1,null,null)().isTrue()')
   end
   
   def test_all_false
-    @context.eval('allFalse(1,null,null,new Boolean(false),new Boolean(false),new Boolean(false))().isTrue()').must_equal true
-    @context.eval('allFalse(1,null,null,new Boolean(false),new Boolean(true),new Boolean(false))().isTrue()').must_equal false
-    @context.eval('allFalse(1,null,null,new Boolean(true),new Boolean(true),new Boolean(true))().isTrue()').must_equal false
-    @context.eval('allFalse(1,null,null)().isTrue()').must_equal false
+    assert_equal true, @context.eval('allFalse(1,null,null,new Boolean(false),new Boolean(false),new Boolean(false))().isTrue()')
+    assert_equal false, @context.eval('allFalse(1,null,null,new Boolean(false),new Boolean(true),new Boolean(false))().isTrue()')
+    assert_equal false, @context.eval('allFalse(1,null,null,new Boolean(true),new Boolean(true),new Boolean(true))().isTrue()')
+    assert_equal false, @context.eval('allFalse(1,null,null)().isTrue()')
   end
   
   def test_at_least_one_false
-    @context.eval('atLeastOneFalse(1,null,null,new Boolean(true),new Boolean(false),new Boolean(false))().isTrue()').must_equal true
-    @context.eval('atLeastOneFalse(1,null,null,new Boolean(true),new Boolean(true),new Boolean(true))().isTrue()').must_equal false
-    @context.eval('atLeastOneFalse(1,null,null,new Boolean(false),new Boolean(false),new Boolean(false))().isTrue()').must_equal true
-    @context.eval('atLeastOneFalse(1,null,null)().isTrue()').must_equal false
+    assert_equal true, @context.eval('atLeastOneFalse(1,null,null,new Boolean(true),new Boolean(false),new Boolean(false))().isTrue()')
+    assert_equal false, @context.eval('atLeastOneFalse(1,null,null,new Boolean(true),new Boolean(true),new Boolean(true))().isTrue()')
+    assert_equal true, @context.eval('atLeastOneFalse(1,null,null,new Boolean(false),new Boolean(false),new Boolean(false))().isTrue()')
+    assert_equal false, @context.eval('atLeastOneFalse(1,null,null)().isTrue()')
   end
   
   def test_patient_extensions
-    @context.eval('typeof hQuery.Patient.prototype.procedureResults').must_equal "function"
-    @context.eval('typeof hQuery.Patient.prototype.laboratoryTests').must_equal "function"
-    @context.eval('typeof hQuery.Patient.prototype.allMedications').must_equal "function"
-    @context.eval('typeof hQuery.Patient.prototype.allProblems').must_equal "function"
-    @context.eval('typeof hQuery.Patient.prototype.allDevices').must_equal "function"
-    @context.eval('typeof hQuery.Patient.prototype.activeDiagnoses').must_equal "function"
-    @context.eval('typeof hQuery.Patient.prototype.inactiveDiagnoses').must_equal "function"
-    @context.eval('typeof hQuery.Patient.prototype.resolvedDiagnoses').must_equal "function"
-    @context.eval('typeof hQuery.Patient.prototype.getEvents').must_equal "function"
+    assert_equal "function", @context.eval('typeof hQuery.Patient.prototype.procedureResults')
+    assert_equal "function", @context.eval('typeof hQuery.Patient.prototype.laboratoryTests')
+    assert_equal "function", @context.eval('typeof hQuery.Patient.prototype.allMedications')
+    assert_equal "function", @context.eval('typeof hQuery.Patient.prototype.allProblems')
+    assert_equal "function", @context.eval('typeof hQuery.Patient.prototype.allDevices')
+    assert_equal "function", @context.eval('typeof hQuery.Patient.prototype.activeDiagnoses')
+    assert_equal "function", @context.eval('typeof hQuery.Patient.prototype.inactiveDiagnoses')
+    assert_equal "function", @context.eval('typeof hQuery.Patient.prototype.resolvedDiagnoses')
+    assert_equal "function", @context.eval('typeof hQuery.Patient.prototype.getEvents')
   end
 
   def test_code_list
-    @context.eval('(new CodeList({"foo": [10,11]})).match(10)').must_equal true
-    @context.eval('(new CodeList({"foo": [10,11]})).match({"code": 10})').must_equal true
-    @context.eval('(new CodeList({"foo": [10,11]})).match(12)').must_equal false
-    @context.eval('(new CodeList({"foo": [10,11]})).match({"code": 12})').must_equal false
+    assert_equal true, @context.eval('(new CodeList({"foo": [10,11]})).match(10)')
+    assert_equal true, @context.eval('(new CodeList({"foo": [10,11]})).match({"code": 10})')
+    assert_equal false, @context.eval('(new CodeList({"foo": [10,11]})).match(12)')
+    assert_equal false, @context.eval('(new CodeList({"foo": [10,11]})).match({"code": 12})')
   end
   
   def test_pq
@@ -86,6 +86,7 @@ class LibraryFunctionTest < Test::Unit::TestCase
     ts = 'new TS("20110101")'
     ts2 = 'new TS("20100101")'
     ts3 = 'new TS("20120101")'
+    ts4 = '(function(){var ts=new TS();ts.date=null;return ts;})()' # set up a null date
     assert_equal 2011, @context.eval("#{ts}.asDate().getUTCFullYear()")
     assert_equal 0, @context.eval("#{ts}.asDate().getUTCMonth()")
     assert_equal 1, @context.eval("#{ts}.asDate().getUTCDate()")
@@ -101,6 +102,9 @@ class LibraryFunctionTest < Test::Unit::TestCase
     assert !@context.eval("#{ts}.after(#{ts3})")
     assert @context.eval("#{ts}.beforeOrConcurrent(#{ts})")
     assert @context.eval("#{ts}.afterOrConcurrent(#{ts})")
+    assert @context.eval("#{ts4}.equals(#{ts4})")
+    assert !@context.eval("#{ts3}.equals(#{ts4})")
+    assert !@context.eval("#{ts4}.equals(#{ts3})")
     
     # The following tests are taken from the Joint Commission guidance on time difference
     # calculations
@@ -269,8 +273,40 @@ class LibraryFunctionTest < Test::Unit::TestCase
     ivl1 = 'new IVL_TS(new TS("20120310"), new TS("20120320"))'
     ivl2 = 'new IVL_TS(new TS("20120312"), new TS("20120320"))'
     assert @context.eval("#{ivl2}.DURING(#{ivl1})")
+    assert !@context.eval("#{ivl1}.equals(#{ivl2})")
     assert_equal 2010, @context.eval('getIVL(new Date(Date.UTC(2010,1,1))).low.asDate().getUTCFullYear()')
   end
+
+  def test_ivl_ts_null
+    ts1 = 'new TS("20120310")'
+    ts2 = 'new TS("20120320")'
+    null_ts = '(function(){var ts=new TS();ts.date=null;return ts;})()'
+    ivl = "new IVL_TS(#{ts1}, #{ts2})"
+    ivl_null_low = "new IVL_TS(#{null_ts}, #{ts2})"
+    ivl_null_high = "new IVL_TS(#{ts1}, #{null_ts})"
+    ivl_null_both = "new IVL_TS(#{null_ts}, #{null_ts})"
+
+    assert @context.eval("#{ivl}.equals(#{ivl})")
+    assert @context.eval("#{ivl_null_low}.equals(#{ivl_null_low})")
+    assert @context.eval("#{ivl_null_high}.equals(#{ivl_null_high})")
+    assert @context.eval("#{ivl_null_both}.equals(#{ivl_null_both})")
+
+    assert !@context.eval("#{ivl}.equals(#{ivl_null_low})")
+    assert !@context.eval("#{ivl}.equals(#{ivl_null_high})")
+    assert !@context.eval("#{ivl}.equals(#{ivl_null_both})")
+
+    assert !@context.eval("#{ivl_null_low}.equals(#{ivl})")
+    assert !@context.eval("#{ivl_null_low}.equals(#{ivl_null_high})")
+    assert !@context.eval("#{ivl_null_low}.equals(#{ivl_null_both})")
+
+    assert !@context.eval("#{ivl_null_high}.equals(#{ivl})")
+    assert !@context.eval("#{ivl_null_high}.equals(#{ivl_null_low})")
+    assert !@context.eval("#{ivl_null_high}.equals(#{ivl_null_both})")
+
+    assert !@context.eval("#{ivl_null_both}.equals(#{ivl})")
+    assert !@context.eval("#{ivl_null_both}.equals(#{ivl_null_low})")
+    assert !@context.eval("#{ivl_null_both}.equals(#{ivl_null_high})")
+  end
   
   def test_any_non_null
     # ANYNonNull
@@ -340,12 +376,33 @@ class LibraryFunctionTest < Test::Unit::TestCase
     assert_equal 2, @context.eval("XPRODUCT(#{events0},#{events2}).length")
     assert_equal 2, @context.eval("XPRODUCT(#{events0},#{events2}).eventLists.length")
   end
+
+  def test_intersection
+    # XPRODUCT
+    events0 = '[]'
+    events1 = '[{id:1}]'
+    events2 = '[{id:2},{id:3},{id:4}]'
+    events3 = '[{id:3},{id:5}]'
+    assert_equal 0, @context.eval("INTERSECT().length")
+    assert_equal 0, @context.eval("INTERSECT(#{events0}).length")
+    assert_equal 3, @context.eval("INTERSECT(#{events2}).length")
+    assert_equal 0, @context.eval("INTERSECT(#{events1},#{events2}).length")
+    assert_equal 0, @context.eval("INTERSECT(#{events0},#{events2}).length")
+    assert_equal 1, @context.eval("INTERSECT(#{events2},#{events3}).length")
+    assert_equal 0, @context.eval("INTERSECT(#{events2},#{events3},#{events1}).length")
+  end
   
   def test_temporal_operators
     # Events and bounds for temporal operators
     @context.eval('var events1 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20120105"), new TS("20120105"));}}]')
     @context.eval('var events2 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20120102"), new TS("20120105"));}}]')
     @context.eval('var events3 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20120105203030"), new TS("20120105203030"));}}]')
+    @context.eval('var nullEndEvent = new IVL_TS(new TS("20110101"), new TS("20120105"));')
+    @context.eval('nullEndEvent.high.date = null;')
+    @context.eval('var events4 = [{"asIVL_TS": function() {return nullEndEvent;}}]')
+    @context.eval('var events5 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20140101"), new TS("20140201"));}}]')
+    @context.eval('var events6 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20101101"), new TS("20110101"));}}]')
+    @context.eval('var events7 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20110101"), new TS("20110201"));}}]')
     @context.eval('var bound1 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20120105"), new TS("20120105"));}}]')
     @context.eval('var bound2 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20120107"), new TS("20120107"));}}]')
     @context.eval('var bound3 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20120103"), new TS("20120107"));}}]')
@@ -353,8 +410,11 @@ class LibraryFunctionTest < Test::Unit::TestCase
     @context.eval('var bound5 = {"asIVL_TS": function() {return new IVL_TS(new TS("20120106"), new TS("20120107"));}}')
     @context.eval('var nullStartBound = new IVL_TS(new TS("20120105"), new TS("20120105"));')
     @context.eval('nullStartBound.low.date = null;')
+    @context.eval('var nullEndBound = new IVL_TS(new TS("20140601"), new TS("20140601"));')
+    @context.eval('nullEndBound.high.date = null;')
     @context.eval('var bound6 = {"asIVL_TS": function() {return nullStartBound;}}')
     @context.eval('var bound7 = [{"asIVL_TS": function() {return new IVL_TS(new TS("20120105193030"), new TS("20120105193030"));}}]')
+    @context.eval('var bound8 = {"asIVL_TS": function() {return nullEndBound;}}')
     @context.eval('var range1 = new IVL_PQ(null, new PQ(1, "d"))')
     @context.eval('var range2 = new IVL_PQ(new PQ(1, "d"), null)')
     @context.eval('var range3 = new IVL_PQ(new PQ(0, "d"), null)')
@@ -415,7 +475,18 @@ class LibraryFunctionTest < Test::Unit::TestCase
     assert_equal 0, @context.eval('OVERLAP(events2, XPRODUCT(bound6))').count
     assert_equal 1, @context.eval('OVERLAP(events2, XPRODUCT(bound1))').count
     assert_equal 0, @context.eval('OVERLAP(events2, XPRODUCT(bound2))').count
+    ## Overlap with null ending
+    assert_equal 1, @context.eval('OVERLAP(events4, bound8)').count
+    assert_equal 1, @context.eval('OVERLAP(events4, bound1)').count
+    assert_equal 0, @context.eval('OVERLAP(events5, bound8)').count
+    assert_equal 1, @context.eval('OVERLAP(events6, events4)').count
+    assert_equal 1, @context.eval('OVERLAP(events4, events7)').count
     
+    # SCW
+    assert_equal 1, @context.eval('SCW(events1, bound1)').count
+    assert_equal 0, @context.eval('SCW(events1, bound6)').count
+    assert_equal 0, @context.eval('SCW(events1, bound2)').count
+
     # SBS
     assert_equal 0, @context.eval('SBS(events1, bound1)').count
     assert_equal 0, @context.eval('SBS(events2, bound1, range1)').count
@@ -423,12 +494,38 @@ class LibraryFunctionTest < Test::Unit::TestCase
     assert_equal 1, @context.eval('SBS(events2, bound1, range2)').count
     assert_equal 0, @context.eval('SBS(events3, bound7, range3)').count
     
+    #SBCW
+    assert_equal 1, @context.eval('SBCW(events1, bound1)').count
+    assert_equal 0, @context.eval('SBCW(events2, bound1, range1)').count
+    assert_equal 1, @context.eval('SBCW(events2, bound1)').count
+    assert_equal 1, @context.eval('SBCW(events2, bound1, range2)').count
+    assert_equal 0, @context.eval('SBCW(events3, bound7, range3)').count
+    assert_equal 0, @context.eval('SBCW(events1, bound6)').count
+    assert_equal 1, @context.eval('SBCW(events1, bound2)').count
+
     # SAS
     assert_equal 0, @context.eval('SAS(events1, bound1)').count
     assert_equal 0, @context.eval('SAS(events2, bound1, range1)').count
     assert_equal 0, @context.eval('SAS(events2, bound1)').count
     assert_equal 0, @context.eval('SAS(events2, bound1, range2)').count
     
+    #SACW
+    assert_equal 1, @context.eval('SACW(events1, bound1)').count
+    assert_equal 0, @context.eval('SACW(events2, bound1, range1)').count
+    assert_equal 0, @context.eval('SACW(events2, bound1)').count
+    assert_equal 0, @context.eval('SACW(events2, bound1, range2)').count
+    assert_equal 0, @context.eval('SACW(events1, bound6)').count
+    assert_equal 0, @context.eval('SACW(events1, bound2)').count
+
+
+    # SBDU
+    assert_equal 0, @context.eval('SBDU(events2, bound1, range1)').count
+    assert_equal 1, @context.eval('SBDU(events2, bound1)').count
+    assert_equal 1, @context.eval('SBDU(events2, bound1, range2)').count
+    assert_equal 0, @context.eval('SBDU(events3, bound7, range3)').count
+    assert_equal 1, @context.eval('SBDU(events1, bound1)').count
+    assert_equal 1, @context.eval('SBDU(events1, bound2)').count
+
     # SBE
     assert_equal 0, @context.eval('SBE(events1, bound1)').count
     assert_equal 1, @context.eval('SBE(events1, bound2)').count
@@ -466,10 +563,30 @@ class LibraryFunctionTest < Test::Unit::TestCase
     assert_equal 1, @context.eval('ECW(events1, bound6)').count
     assert_equal 0, @context.eval('ECW(events1, bound2)').count
     
-    # SCW
-    assert_equal 1, @context.eval('SCW(events1, bound1)').count
-    assert_equal 0, @context.eval('SCW(events1, bound6)').count
-    assert_equal 0, @context.eval('SCW(events1, bound2)').count
+    #EBCW
+    assert_equal 1, @context.eval('ECW(events1, bound1)').count
+    assert_equal 1, @context.eval('ECW(events1, bound6)').count
+    assert_equal 0, @context.eval('ECW(events1, bound2)').count
+    assert_equal 0, @context.eval('EBE(events1, bound1)').count
+    assert_equal 1, @context.eval('EBE(events1, bound2)').count
+    
+    #EBCWS
+    assert_equal 0, @context.eval('EBS(events1, bound1)').count
+    assert_equal 1, @context.eval('EBS(events1, bound2)').count
+
+    #EACW
+    assert_equal 1, @context.eval('EACW(events1, bound1)').count
+    assert_equal 1, @context.eval('EACW(events1, bound6)').count
+    assert_equal 0, @context.eval('EACW(events1, bound2)').count
+    assert_equal 1, @context.eval('EACW(bound3, events2)').count
+    
+    #EACWS
+    assert_equal 1, @context.eval('EACWS(events1, bound1)').count
+    assert_equal 1, @context.eval('EACWS(events1, bound3)').count
+  
+    #EBDU
+    assert_equal 1, @context.eval('EBDU(events1, bound1)').count
+    assert_equal 1, @context.eval('EBDU(events1, bound2)').count
     
     # ECWS
     assert_equal 1, @context.eval('ECWS(events1, bound1)').count
@@ -481,6 +598,17 @@ class LibraryFunctionTest < Test::Unit::TestCase
     assert_equal 1, @context.eval('SCWE(events1, bound6)').count
     assert_equal 0, @context.eval('SCWE(events1, bound2)').count
     
+    # SBCWE
+    assert_equal 1, @context.eval('SBCWE(events1, bound1)').count
+    assert_equal 1, @context.eval('SBCWE(events1, bound6)').count
+    assert_equal 1, @context.eval('SBCWE(events1, bound2)').count
+    
+    # SACWE
+    assert_equal 1, @context.eval('SACWE(events1, bound1)').count
+    assert_equal 1, @context.eval('SACWE(events1, bound6)').count
+    assert_equal 0, @context.eval('SACWE(events1, bound2)').count
+    assert_equal 1, @context.eval('SACWE(bound2, events1)').count
+
     # CONCURRENT
     assert_equal 1, @context.eval('CONCURRENT(events1, bound1)').count
     assert_equal 0, @context.eval('CONCURRENT(events1, bound2)').count
@@ -493,9 +621,28 @@ class LibraryFunctionTest < Test::Unit::TestCase
     assert_equal true, @context.eval('DATEDIFF([diffEvent1,diffEvent2],range4).isTrue()')
     assert_equal true, @context.eval('DATEDIFF([diffEvent2,diffEvent1],range4).isTrue()')
     assert_equal true, @context.eval('DATEDIFF([diffEvent1,diffEvent1],range4).isTrue()')
-    
-    # false test
-    
+
+    assert_equal true, @context.eval('DATETIMEDIFF([diffEvent1,diffEvent2],range4).isTrue()')
+    assert_equal true, @context.eval('DATETIMEDIFF([diffEvent2,diffEvent1],range4).isTrue()')
+    assert_equal true, @context.eval('DATETIMEDIFF([diffEvent1,diffEvent1],range4).isTrue()')
+
+
+    @context.eval("
+      var ts1 = new TS('20100101100000');
+      var ts2 = new TS('20100101101000');
+      var ts3 = new TS('20100101103000');
+      
+      var ddEvents1 = [{'id': 1, 'asTS': function() {return ts1;}}];
+      var ddEvents2 = [{'id': 20, 'asTS': function() {return ts2;}}];
+      var ddEvents3 = [{'id': 30, 'asTS': function() {return ts3;}, 'timeStamp': function() {return ts3.date}}, {'id': 20, 'asTS': function() {return ts2;}, 'timeStamp': function() {return ts2.date}}];
+    ");
+
+    assert_equal 1, @context.eval('DATETIMEDIFF(XPRODUCT(ddEvents1,ddEvents2)).length')
+    assert_equal 10, @context.eval('DATETIMEDIFF(XPRODUCT(ddEvents1,ddEvents2))[0]')
+    assert_equal 1, @context.eval('DATETIMEDIFF(XPRODUCT(ddEvents1,ddEvents3)).length')
+    assert_equal 30, @context.eval('DATETIMEDIFF(XPRODUCT(ddEvents1,ddEvents3))[0]')
+    assert_equal 1, @context.eval('DATETIMEDIFF(XPRODUCT(ddEvents2,ddEvents3)).length')
+    assert_equal 20, @context.eval('DATETIMEDIFF(XPRODUCT(ddEvents2,ddEvents3))[0]')
     
   end
   
@@ -572,9 +719,30 @@ class LibraryFunctionTest < Test::Unit::TestCase
     assert !@context.eval("MIN(#{events2},#{between15and25}).isTrue()")
     assert @context.eval("MAX(#{events2},#{between15and25}).isTrue()")
   end
+
+  def test_qdm_functions
+    # SUM and MEDIAN
+    @context.eval('var medications = [{"cumulativeMedicationDuration": function() { return 30;}}, {"cumulativeMedicationDuration": function() {return 40;}}, {"cumulativeMedicationDuration": function() {return 50;}}];')
+    v10 = '{"values": function() {return {"scalar": 10};}}'
+    v20 = '{"values": function() {return {"scalar": 20};}}'
+    events2 = "[#{v10},#{v20}]"
+    moreThan80 = 'new IVL_PQ(new PQ(81,"d"))'
+    exactly15 = 'new IVL_PQ(new PQ(15), new PQ(15))'
+    exactly30 = 'new IVL_PQ(new PQ(30), new PQ(30))'
+    exactly40 = 'new IVL_PQ(new PQ(40,"d"), new PQ(40,"d"))'
+    field_method = ['cumulativeMedicationDuration']
+    assert_equal true, @context.eval("SUM(medications,#{moreThan80},null,#{field_method}).isTrue()")
+    assert_equal true, @context.eval("MEDIAN(medications,#{exactly40},null,#{field_method}).isTrue()")
+    assert_equal false, @context.eval("SUM(medications,#{moreThan80},null,null).isTrue()")
+    assert_equal false, @context.eval("MEDIAN(medications,#{exactly40},null,null).isTrue()")
+    assert_equal true, @context.eval("MEDIAN(#{events2},#{exactly15},null,['result']).isTrue()")
+    assert_equal false, @context.eval("MEDIAN(#{events2},#{moreThan80},null,['result']).isTrue()")
+    assert_equal true, @context.eval("SUM(#{events2},#{exactly30},null,['result']).isTrue()")
+    assert_equal false, @context.eval("SUM(#{events2},#{exactly40},null,['result']).isTrue()")
+  end
   
   def test_respond_to
     assert @context.eval("(new hQuery.Allergy({})).respondTo('severity')")
     assert !@context.eval("(new hQuery.Allergy({})).respondTo('canHasCheeseburger')")
   end
-end
+end

data/test/unit/specifics_test.rb

@@ -1,13 +1,13 @@
 require_relative '../test_helper'
 require 'hquery-patient-api'
 
-class SpecificsTest < Test::Unit::TestCase
+class SpecificsTest < Minitest::Test
   
   def setup
     @context = get_js_context(HQMF2JS::Generator::JS.library_functions)
     test_initialize_js = 
     "
-      hqmf.SpecificsManager.initialize({},hqmfjs, {'id':'OccurrenceAEncounter', 'type':'Encounter', 'function':'SourceOccurrenceAEncounter'},{'id':'OccurrenceBEncounter', 'type':'Encounter', 'function':'SourceOccurrenceBEncounter'})
+      hqmf.SpecificsManager.initialize({},hqmfjs, {'id':'OccurrenceAEncounter', 'type':'OccA_Encounter', 'function':'SourceOccurrenceAEncounter'},{'id':'OccurrenceBEncounter', 'type':'OccB_Encounter', 'function':'SourceOccurrenceBEncounter'})
       hqmfjs.SourceOccurrenceAEncounter = function(patient) {
         return [{'id':1},{'id':2},{'id':3},{'id':4},{'id':5}]
       }
@@ -21,15 +21,15 @@ class SpecificsTest < Test::Unit::TestCase
 
   def test_specifics_initialized_properly
     
-    @context.eval('hqmf.SpecificsManager.keyLookup[0]').must_equal 'OccurrenceAEncounter'
-    @context.eval('hqmf.SpecificsManager.keyLookup[1]').must_equal 'OccurrenceBEncounter'
-    @context.eval("hqmf.SpecificsManager.indexLookup['OccurrenceAEncounter']").must_equal 0
-    @context.eval("hqmf.SpecificsManager.indexLookup['OccurrenceBEncounter']").must_equal 1
-    @context.eval('hqmf.SpecificsManager.functionLookup[0]').must_equal 'SourceOccurrenceAEncounter'
-    @context.eval('hqmf.SpecificsManager.functionLookup[1]').must_equal 'SourceOccurrenceBEncounter'
-    @context.eval("hqmf.SpecificsManager.typeLookup['Encounter'].length").must_equal 2
-    @context.eval("hqmf.SpecificsManager.typeLookup['Encounter'][0]").must_equal 0
-    @context.eval("hqmf.SpecificsManager.typeLookup['Encounter'][1]").must_equal 1
+    assert_equal 'OccurrenceAEncounter', @context.eval('hqmf.SpecificsManager.keyLookup[0]')
+    assert_equal 'OccurrenceBEncounter', @context.eval('hqmf.SpecificsManager.keyLookup[1]')
+    assert_equal 0, @context.eval("hqmf.SpecificsManager.indexLookup['OccurrenceAEncounter']")
+    assert_equal 1, @context.eval("hqmf.SpecificsManager.indexLookup['OccurrenceBEncounter']")
+    assert_equal 'SourceOccurrenceAEncounter', @context.eval('hqmf.SpecificsManager.functionLookup[0]')
+    assert_equal 'SourceOccurrenceBEncounter', @context.eval('hqmf.SpecificsManager.functionLookup[1]')
+    assert_equal 2, @context.eval("hqmf.SpecificsManager.typeLookup['Encounter'].length")
+    assert_equal 0, @context.eval("hqmf.SpecificsManager.typeLookup['Encounter'][0]")
+    assert_equal 1, @context.eval("hqmf.SpecificsManager.typeLookup['Encounter'][1]")
   end
   
   def test_specifics_row_union
@@ -43,11 +43,11 @@ class SpecificsTest < Test::Unit::TestCase
       result.rows.length;
     "
     
-    @context.eval(union_rows).must_equal 2
-    @context.eval("result.rows[0].values[0].id").must_equal 1
-    @context.eval("result.rows[0].values[1]").must_equal '*'
-    @context.eval("result.rows[1].values[0]").must_equal '*'
-    @context.eval("result.rows[1].values[1].id").must_equal 2
+    assert_equal 2, @context.eval(union_rows)
+    assert_equal 1, @context.eval("result.rows[0].values[0].id")
+    assert_equal '*', @context.eval("result.rows[0].values[1]")
+    assert_equal '*', @context.eval("result.rows[1].values[0]")
+    assert_equal 2, @context.eval("result.rows[1].values[1].id")
     
   end
 
@@ -61,14 +61,14 @@ class SpecificsTest < Test::Unit::TestCase
     "
     
     @context.eval(rows)
-    @context.eval("row1.values[0].id").must_equal 1
-    @context.eval("row1.values[1]").must_equal '*'
-    @context.eval("row2.values[0]").must_equal '*'
-    @context.eval("row2.values[1].id").must_equal 2
-    @context.eval("row3.values[0].id").must_equal 1
-    @context.eval("row3.values[1].id").must_equal 2
-    @context.eval("row4.values[0]").must_equal '*'
-    @context.eval("row4.values[1]").must_equal '*'
+    assert_equal 1, @context.eval("row1.values[0].id")
+    assert_equal '*', @context.eval("row1.values[1]")
+    assert_equal '*', @context.eval("row2.values[0]")
+    assert_equal 2, @context.eval("row2.values[1].id")
+    assert_equal 1, @context.eval("row3.values[0].id")
+    assert_equal 2, @context.eval("row3.values[1].id")
+    assert_equal '*', @context.eval("row4.values[0]")
+    assert_equal '*', @context.eval("row4.values[1]")
   end
     
   
@@ -77,11 +77,11 @@ class SpecificsTest < Test::Unit::TestCase
       var row1 = new Row(undefined, {});
     "
     @context.eval(rows)
-    @context.eval("Row.match('*', {'id':1}).id").must_equal 1
-    @context.eval("Row.match({'id':2}, '*').id").must_equal 2
-    @context.eval("Row.match({'id':1}, {'id':1}).id").must_equal 1
-    @context.eval("Row.match('*', '*')").must_equal '*'
-    @context.eval("typeof(Row.match({'id':3}, {'id':2})) === 'undefined'").must_equal true
+    assert_equal 1, @context.eval("Row.match('*', {'id':1}).id")
+    assert_equal 2, @context.eval("Row.match({'id':2}, '*').id")
+    assert_equal 1, @context.eval("Row.match({'id':1}, {'id':1}).id")
+    assert_equal '*', @context.eval("Row.match('*', '*')")
+    assert_equal true, @context.eval("typeof(Row.match({'id':3}, {'id':2})) === 'undefined'")
     
   end
   
@@ -98,12 +98,12 @@ class SpecificsTest < Test::Unit::TestCase
     "
     
     @context.eval(rows)
-    @context.eval("row1.equals(row1)").must_equal true
-    @context.eval("row1.equals(row2)").must_equal false
-    @context.eval("row2.equals(row2)").must_equal true
-    @context.eval("row3.equals(row4)").must_equal false
-    @context.eval("row4.equals(row5)").must_equal true
-    @context.eval("row6.equals(row6)").must_equal true
+    assert_equal true, @context.eval("row1.equals(row1)")
+    assert_equal false, @context.eval("row1.equals(row2)")
+    assert_equal true, @context.eval("row2.equals(row2)")
+    assert_equal false, @context.eval("row3.equals(row4)")
+    assert_equal true, @context.eval("row4.equals(row5)")
+    assert_equal true, @context.eval("row6.equals(row6)")
     
   end
   
@@ -120,26 +120,26 @@ class SpecificsTest < Test::Unit::TestCase
     "
     
     @context.eval(rows)
-    @context.eval("row1.intersect(row2).values[0].id").must_equal 1
-    @context.eval("row1.intersect(row2).values[1].id").must_equal 2
-    @context.eval("row2.intersect(row1).values[0].id").must_equal 1
-    @context.eval("row2.intersect(row1).values[1].id").must_equal 2
-    @context.eval("row1.intersect(row3).values[0].id").must_equal 1
-    @context.eval("row1.intersect(row3).values[1].id").must_equal 2
-    @context.eval("row2.intersect(row3).values[0].id").must_equal 1
-    @context.eval("row2.intersect(row3).values[1].id").must_equal 2
-    @context.eval("typeof(row1.intersect(row4)) === 'undefined'").must_equal true
-    @context.eval("row2.intersect(row4).values[0].id").must_equal 2
-    @context.eval("row2.intersect(row4).values[1].id").must_equal 2
-    @context.eval("typeof(row1.intersect(row5)) === 'undefined'").must_equal true
-    @context.eval("typeof(row2.intersect(row5)) === 'undefined'").must_equal true
-    @context.eval("typeof(row3.intersect(row4)) === 'undefined'").must_equal true
-    @context.eval("row1.intersect(row6).values[0].id").must_equal 1
-    @context.eval("row1.intersect(row6).values[1]").must_equal '*'
-    @context.eval("row2.intersect(row6).values[0]").must_equal '*'
-    @context.eval("row2.intersect(row6).values[1].id").must_equal 2
-    @context.eval("row6.intersect(row6).values[0]").must_equal '*'
-    @context.eval("row6.intersect(row6).values[1]").must_equal '*'
+    assert_equal 1, @context.eval("row1.intersect(row2).values[0].id")
+    assert_equal 2, @context.eval("row1.intersect(row2).values[1].id")
+    assert_equal 1, @context.eval("row2.intersect(row1).values[0].id")
+    assert_equal 2, @context.eval("row2.intersect(row1).values[1].id")
+    assert_equal 1, @context.eval("row1.intersect(row3).values[0].id")
+    assert_equal 2, @context.eval("row1.intersect(row3).values[1].id")
+    assert_equal 1, @context.eval("row2.intersect(row3).values[0].id")
+    assert_equal 2, @context.eval("row2.intersect(row3).values[1].id")
+    assert_equal true, @context.eval("typeof(row1.intersect(row4)) === 'undefined'")
+    assert_equal 2, @context.eval("row2.intersect(row4).values[0].id")
+    assert_equal 2, @context.eval("row2.intersect(row4).values[1].id")
+    assert_equal true, @context.eval("typeof(row1.intersect(row5)) === 'undefined'")
+    assert_equal true, @context.eval("typeof(row2.intersect(row5)) === 'undefined'")
+    assert_equal true, @context.eval("typeof(row3.intersect(row4)) === 'undefined'")
+    assert_equal 1, @context.eval("row1.intersect(row6).values[0].id")
+    assert_equal '*', @context.eval("row1.intersect(row6).values[1]")
+    assert_equal '*', @context.eval("row2.intersect(row6).values[0]")
+    assert_equal 2, @context.eval("row2.intersect(row6).values[1].id")
+    assert_equal '*', @context.eval("row6.intersect(row6).values[0]")
+    assert_equal '*', @context.eval("row6.intersect(row6).values[1]")
     
   end
   
@@ -171,34 +171,34 @@ class SpecificsTest < Test::Unit::TestCase
     "
     
     @context.eval(intersect_rows)
-    @context.eval("specific1.intersect(specific2).rows.length").must_equal 1
-    @context.eval("specific1.intersect(specific2).rows[0].values[0].id").must_equal 1
-    @context.eval("specific1.intersect(specific2).rows[0].values[1].id").must_equal 2
+    assert_equal 1, @context.eval("specific1.intersect(specific2).rows.length")
+    assert_equal 1, @context.eval("specific1.intersect(specific2).rows[0].values[0].id")
+    assert_equal 2, @context.eval("specific1.intersect(specific2).rows[0].values[1].id")
   
-    @context.eval("specific1.intersect(specific3).rows.length").must_equal 1
-    @context.eval("specific1.intersect(specific3).rows[0].values[0].id").must_equal 1
-    @context.eval("specific1.intersect(specific3).rows[0].values[1].id").must_equal 2
+    assert_equal 1, @context.eval("specific1.intersect(specific3).rows.length")
+    assert_equal 1, @context.eval("specific1.intersect(specific3).rows[0].values[0].id")
+    assert_equal 2, @context.eval("specific1.intersect(specific3).rows[0].values[1].id")
   
-    @context.eval("specific1.intersect(specific4).rows.length").must_equal 2
-    @context.eval("specific1.intersect(specific4).rows[0].values[0].id").must_equal 1
-    @context.eval("specific1.intersect(specific4).rows[0].values[1].id").must_equal 2
-    @context.eval("specific1.intersect(specific4).rows[1].values[0].id").must_equal 1
-    @context.eval("specific1.intersect(specific4).rows[1].values[1].id").must_equal 3
+    assert_equal 2, @context.eval("specific1.intersect(specific4).rows.length")
+    assert_equal 1, @context.eval("specific1.intersect(specific4).rows[0].values[0].id")
+    assert_equal 2, @context.eval("specific1.intersect(specific4).rows[0].values[1].id")
+    assert_equal 1, @context.eval("specific1.intersect(specific4).rows[1].values[0].id")
+    assert_equal 3, @context.eval("specific1.intersect(specific4).rows[1].values[1].id")
   
-    @context.eval("specific2.intersect(specific3).rows.length").must_equal 2
-    @context.eval("specific2.intersect(specific3).rows[0].values[0].id").must_equal 1
-    @context.eval("specific2.intersect(specific3).rows[0].values[1].id").must_equal 2
-    @context.eval("specific2.intersect(specific3).rows[1].values[0].id").must_equal 2
-    @context.eval("specific2.intersect(specific3).rows[1].values[1].id").must_equal 2
+    assert_equal 2, @context.eval("specific2.intersect(specific3).rows.length")
+    assert_equal 1, @context.eval("specific2.intersect(specific3).rows[0].values[0].id")
+    assert_equal 2, @context.eval("specific2.intersect(specific3).rows[0].values[1].id")
+    assert_equal 2, @context.eval("specific2.intersect(specific3).rows[1].values[0].id")
+    assert_equal 2, @context.eval("specific2.intersect(specific3).rows[1].values[1].id")
     
-    @context.eval("specific2.intersect(specific5).rows.length").must_equal 0
+    assert_equal 0, @context.eval("specific2.intersect(specific5).rows.length")
     
-    @context.eval("specific4.intersect(specific5).rows.length").must_equal 1
-    @context.eval("specific4.intersect(specific5).rows[0].values[0].id").must_equal 1
-    @context.eval("specific4.intersect(specific5).rows[0].values[1].id").must_equal 3
+    assert_equal 1, @context.eval("specific4.intersect(specific5).rows.length")
+    assert_equal 1, @context.eval("specific4.intersect(specific5).rows[0].values[0].id")
+    assert_equal 3, @context.eval("specific4.intersect(specific5).rows[0].values[1].id")
 
 
-    @context.eval("allSpecific1.intersect(allSpecific2).rows.length").must_equal 1
+    assert_equal 1, @context.eval("allSpecific1.intersect(allSpecific2).rows.length")
     
   end
   
@@ -221,8 +221,31 @@ class SpecificsTest < Test::Unit::TestCase
     "
     
     @context.eval(init_rows)
-    @context.eval("timediffs.length").must_equal 1
-    @context.eval("timediffs[0]").must_equal 10
+    assert_equal 1, @context.eval("timediffs.length")
+    assert_equal 10, @context.eval("timediffs[0]")
+  end
+
+  def test_specifics_datetimediff
+    init_rows = "
+      var row1 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':20}});
+      var row2 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':2},'OccurrenceBEncounter':{'id':20}});
+      var row3 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':3},'OccurrenceBEncounter':{'id':30}});
+      
+      var specific = new hqmf.SpecificOccurrence([row1,row2,row3]);
+      
+      var ts1 = new TS('20100101100000');
+      var ts2 = new TS('20100101101000');
+      
+      var events1 = [{'id': 1, 'asTS': function() {return ts1;}}];
+      events1.specific_occurrence = 'OccurrenceAEncounter';
+      var events2 = [{'id': 20, 'asTS': function() {return ts2;}},{'id': 30, 'asTS': function() {return ts2;}}];
+      events2.specific_occurrence = 'OccurrenceBEncounter';
+      var timediffs = DATETIMEDIFF(XPRODUCT(events1, events2), null, specific);
+    "
+    
+    @context.eval(init_rows)
+    assert_equal 1, @context.eval("timediffs.length")
+    assert_equal 10, @context.eval("timediffs[0]")
   end
   
   def test_specifics_event_counting
@@ -243,22 +266,22 @@ class SpecificsTest < Test::Unit::TestCase
     "
     
     @context.eval(init_rows)
-    @context.eval("specific.uniqueEvents([0])").must_equal 3
-    @context.eval("specific.uniqueEvents([1])").must_equal 2
-    @context.eval('hqmf.SpecificsManager.indexLookup["OccurrenceAEncounter"]').must_equal 0
-    @context.eval('hqmf.SpecificsManager.indexLookup["OccurrenceBEncounter"]').must_equal 1
-    @context.eval('hqmf.SpecificsManager.getColumnIndex("OccurrenceAEncounter")').must_equal 0
-    @context.eval('hqmf.SpecificsManager.getColumnIndex("OccurrenceBEncounter")').must_equal 1
-    assert_raise V8::JSError do
+    assert_equal 3, @context.eval("specific.uniqueEvents([0])")
+    assert_equal 2, @context.eval("specific.uniqueEvents([1])")
+    assert_equal 0, @context.eval('hqmf.SpecificsManager.indexLookup["OccurrenceAEncounter"]')
+    assert_equal 1, @context.eval('hqmf.SpecificsManager.indexLookup["OccurrenceBEncounter"]')
+    assert_equal 0, @context.eval('hqmf.SpecificsManager.getColumnIndex("OccurrenceAEncounter")')
+    assert_equal 1, @context.eval('hqmf.SpecificsManager.getColumnIndex("OccurrenceBEncounter")')
+    assert_raises V8::JSError do
       @context.eval('hqmf.SpecificsManager.getColumnIndex("OccurrenceCEncounter")')
     end
-    @context.eval('hqmf.SpecificsManager.validate(pop)').must_equal true
-    @context.eval('hqmf.SpecificsManager.countUnique(["OccurrenceAEncounter"], pop)').must_equal 3
-    @context.eval('hqmf.SpecificsManager.countUnique(["OccurrenceBEncounter"], pop)').must_equal 2
+    assert_equal true, @context.eval('hqmf.SpecificsManager.validate(pop)')
+    assert_equal 3, @context.eval('hqmf.SpecificsManager.countUnique(["OccurrenceAEncounter"], pop)')
+    assert_equal 2, @context.eval('hqmf.SpecificsManager.countUnique(["OccurrenceBEncounter"], pop)')
     # this should be 3 and not 5 because we are doing a multiple encounter episode check.  The OccurrenceB rows should be dropped since
     # we cannot have multiple values defined on a single row for a multi encounter episode check for unique.
-    @context.eval('hqmf.SpecificsManager.countUnique(["OccurrenceAEncounter", "OccurrenceBEncounter"], pop)').must_equal 3
-    @context.eval('hqmf.SpecificsManager.countUnique(null, pop)').must_equal 1
+    assert_equal 3, @context.eval('hqmf.SpecificsManager.countUnique(["OccurrenceAEncounter", "OccurrenceBEncounter"], pop)')
+    assert_equal 1, @context.eval('hqmf.SpecificsManager.countUnique(null, pop)')
   end
 
   def test_specifics_event_exclusion
@@ -285,33 +308,33 @@ class SpecificsTest < Test::Unit::TestCase
     
     @context.eval(init_rows)
     @context.eval('var resultSpecific = specific1.removeMatchingRows(0, specific2)')
-    @context.eval('resultSpecific.rows.length').must_equal 2
-    @context.eval('resultSpecific.rows[0].values[0].id').must_equal 2
-    @context.eval('resultSpecific.rows[1].values[0].id').must_equal 3
+    assert_equal 2, @context.eval('resultSpecific.rows.length')
+    assert_equal 2, @context.eval('resultSpecific.rows[0].values[0].id')
+    assert_equal 3, @context.eval('resultSpecific.rows[1].values[0].id')
     @context.eval('resultSpecific = specific1.removeMatchingRows(1, specific2)')
-    @context.eval('resultSpecific.rows.length').must_equal 1
-    @context.eval('resultSpecific.rows[0].values[0].id').must_equal 3
+    assert_equal 1, @context.eval('resultSpecific.rows.length')
+    assert_equal 3, @context.eval('resultSpecific.rows[0].values[0].id')
     @context.eval('var result = hqmf.SpecificsManager.exclude(["OccurrenceAEncounter"], pop1, pop2)')
-    @context.eval('result.isTrue()').must_equal true
-    @context.eval('result.specificContext.rows.length').must_equal 2
-    @context.eval('result.specificContext.rows[0].values[0].id').must_equal 2
-    @context.eval('result.specificContext.rows[1].values[0].id').must_equal 3
+    assert_equal true, @context.eval('result.isTrue()')
+    assert_equal 2, @context.eval('result.specificContext.rows.length')
+    assert_equal 2, @context.eval('result.specificContext.rows[0].values[0].id')
+    assert_equal 3, @context.eval('result.specificContext.rows[1].values[0].id')
     @context.eval('result = hqmf.SpecificsManager.exclude(["OccurrenceBEncounter"], pop1, pop2)')
-    @context.eval('result.isTrue()').must_equal true
-    @context.eval('result.specificContext.rows.length').must_equal 1
-    @context.eval('result.specificContext.rows[0].values[0].id').must_equal 3
+    assert_equal true, @context.eval('result.isTrue()')
+    assert_equal 1, @context.eval('result.specificContext.rows.length')
+    assert_equal 3, @context.eval('result.specificContext.rows[0].values[0].id')
     @context.eval('result = hqmf.SpecificsManager.exclude(["OccurrenceAEncounter","OccurrenceBEncounter"], pop1, pop2)')
-    @context.eval('result.isTrue()').must_equal true
-    @context.eval('result.specificContext.rows.length').must_equal 1
-    @context.eval('result.specificContext.rows[0].values[0].id').must_equal 3
+    assert_equal true, @context.eval('result.isTrue()')
+    assert_equal 1, @context.eval('result.specificContext.rows.length')
+    assert_equal 3, @context.eval('result.specificContext.rows[0].values[0].id')
     @context.eval('result = hqmf.SpecificsManager.exclude(null, pop3, pop3)')
-    @context.eval('result.isTrue()').must_equal false
+    assert_equal false, @context.eval('result.isTrue()')
     @context.eval('result = hqmf.SpecificsManager.exclude(null, pop3, pop4)')
-    @context.eval('result.isTrue()').must_equal true
+    assert_equal true, @context.eval('result.isTrue()')
     @context.eval('result = hqmf.SpecificsManager.exclude(null, pop4, pop3)')
-    @context.eval('result.isTrue()').must_equal false
+    assert_equal false, @context.eval('result.isTrue()')
     @context.eval('result = hqmf.SpecificsManager.exclude(null, pop4, pop4)')
-    @context.eval('result.isTrue()').must_equal false
+    assert_equal false, @context.eval('result.isTrue()')
   end
 
   def test_negation
@@ -337,44 +360,44 @@ class SpecificsTest < Test::Unit::TestCase
     @context.eval(rows)
     
     # has row checks
-    @context.eval('specific1.hasRow(row1)').must_equal true
-    @context.eval('specific1.hasRow(row2)').must_equal true
-    @context.eval('specific1.hasRow(row3)').must_equal true
-    @context.eval('specific1.hasRow(row4)').must_equal false
-    @context.eval('specific1.hasRow(row5)').must_equal false
+    assert_equal true, @context.eval('specific1.hasRow(row1)')
+    assert_equal true, @context.eval('specific1.hasRow(row2)')
+    assert_equal true, @context.eval('specific1.hasRow(row3)')
+    assert_equal false, @context.eval('specific1.hasRow(row4)')
+    assert_equal false, @context.eval('specific1.hasRow(row5)')
     
     # cartesian checks
-    @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3]]).length').must_equal 3
-    @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3],[5,6]]).length').must_equal 6
-    @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3],[5,6]])[0][0]').must_equal 1
-    @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3],[5,6]])[0][1]').must_equal 5
-    @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3],[5,6]])[1][0]').must_equal 1
-    @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3],[5,6]])[1][1]').must_equal 6
-    @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3],[5,6]])[2][0]').must_equal 2
-    @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3],[5,6]])[2][1]').must_equal 5
+    assert_equal 3, @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3]]).length')
+    assert_equal 6, @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3],[5,6]]).length')
+    assert_equal 1, @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3],[5,6]])[0][0]')
+    assert_equal 5, @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3],[5,6]])[0][1]')
+    assert_equal 1, @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3],[5,6]])[1][0]')
+    assert_equal 6, @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3],[5,6]])[1][1]')
+    assert_equal 2, @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3],[5,6]])[2][0]')
+    assert_equal 5, @context.eval('hqmf.SpecificsManager._generateCartisian([[1,2,3],[5,6]])[2][1]')
     
     # specificsWithValue on Row
-    @context.eval('row1.specificsWithValues()[0]').must_equal 0
-    @context.eval('row2.specificsWithValues()[0]').must_equal 1
-    @context.eval('row3.specificsWithValues()[0]').must_equal 0
-    @context.eval('row3.specificsWithValues()[1]').must_equal 1
+    assert_equal 0, @context.eval('row1.specificsWithValues()[0]')
+    assert_equal 1, @context.eval('row2.specificsWithValues()[0]')
+    assert_equal 0, @context.eval('row3.specificsWithValues()[0]')
+    assert_equal 1, @context.eval('row3.specificsWithValues()[1]')
   
     # specificsWithValue on Specific
-    @context.eval('specific1.specificsWithValues()[0]').must_equal 0
-    @context.eval('specific2.specificsWithValues()[0]').must_equal 1
-    @context.eval('specific3.specificsWithValues()[0]').must_equal 0
-    @context.eval('specific3.specificsWithValues()[1]').must_equal 1
-    @context.eval('specific6.specificsWithValues()[0]').must_equal 0
-    @context.eval('specific6.specificsWithValues()[1]').must_equal 1
-    
-    @context.eval('specific1.negate().rows.length').must_equal 4
-    @context.eval('specific1.negate().rows[0].values[0].id').must_equal 2
-    @context.eval('specific1.negate().rows[1].values[0].id').must_equal 3
-    @context.eval('specific1.negate().rows[2].values[0].id').must_equal 4
-    @context.eval('specific1.negate().rows[3].values[0].id').must_equal 5
+    assert_equal 0, @context.eval('specific1.specificsWithValues()[0]')
+    assert_equal 1, @context.eval('specific2.specificsWithValues()[0]')
+    assert_equal 0, @context.eval('specific3.specificsWithValues()[0]')
+    assert_equal 1, @context.eval('specific3.specificsWithValues()[1]')
+    assert_equal 0, @context.eval('specific6.specificsWithValues()[0]')
+    assert_equal 1, @context.eval('specific6.specificsWithValues()[1]')
+    
+    assert_equal 4, @context.eval('specific1.negate().rows.length')
+    assert_equal 2, @context.eval('specific1.negate().rows[0].values[0].id')
+    assert_equal 3, @context.eval('specific1.negate().rows[1].values[0].id')
+    assert_equal 4, @context.eval('specific1.negate().rows[2].values[0].id')
+    assert_equal 5, @context.eval('specific1.negate().rows[3].values[0].id')
     
     # 5*5 values = 25 in the cartesian - 2 in the non-negated = 23 negated - 5 rows with OccurrA and OccurrB equal = 18!
-    @context.eval('specific5.negate().rows.length').must_equal 18
+    assert_equal 18, @context.eval('specific5.negate().rows.length')
     
   end
   
@@ -394,19 +417,19 @@ class SpecificsTest < Test::Unit::TestCase
     
     @context.eval(rows)
     
-    @context.eval('specific1.hasRows()').must_equal false
-    @context.eval('specific2.hasRows()').must_equal true
-    @context.eval('specific1.hasSpecifics()').must_equal false
-    @context.eval('specific2.hasSpecifics()').must_equal true
-    @context.eval('row3.hasSpecifics()').must_equal false
-    @context.eval('row2.hasSpecifics()').must_equal true
+    assert_equal false, @context.eval('specific1.hasRows()')
+    assert_equal true, @context.eval('specific2.hasRows()')
+    assert_equal false, @context.eval('specific1.hasSpecifics()')
+    assert_equal true, @context.eval('specific2.hasSpecifics()')
+    assert_equal false, @context.eval('row3.hasSpecifics()')
+    assert_equal true, @context.eval('row2.hasSpecifics()')
     
-    @context.eval('specific1.rows.length').must_equal 0
+    assert_equal 0, @context.eval('specific1.rows.length')
     @context.eval('specific1.addRows([row2])')
-    @context.eval('specific1.rows.length').must_equal 1
-    @context.eval('specific2.rows.length').must_equal 1
+    assert_equal 1, @context.eval('specific1.rows.length')
+    assert_equal 1, @context.eval('specific2.rows.length')
     @context.eval('specific2.addRows([row3])')
-    @context.eval('specific2.rows.length').must_equal 2
+    assert_equal 2, @context.eval('specific2.rows.length')
     
   end
   
@@ -416,8 +439,8 @@ class SpecificsTest < Test::Unit::TestCase
     @context.eval("x.specific_occurrence = 'specific_occurrence'")
     @context.eval('var a = new Boolean(true)')
     @context.eval("a = hqmf.SpecificsManager.maintainSpecifics(a,x)")
-    @context.eval("typeof(a.specificContext) != 'undefined'").must_equal true
-    @context.eval("typeof(a.specific_occurrence) != 'undefined'").must_equal true
+    assert_equal true, @context.eval("typeof(a.specificContext) != 'undefined'")
+    assert_equal true, @context.eval("typeof(a.specific_occurrence) != 'undefined'")
     
   end
   
@@ -435,8 +458,8 @@ class SpecificsTest < Test::Unit::TestCase
     
     @context.eval(rows)
     
-    @context.eval('specific1.rows.length').must_equal 6
-    @context.eval('specific1.compactReusedEvents().rows.length').must_equal 4
+    assert_equal 6, @context.eval('specific1.rows.length')
+    assert_equal 4, @context.eval('specific1.compactReusedEvents().rows.length')
     
   end
 
@@ -469,11 +492,69 @@ class SpecificsTest < Test::Unit::TestCase
     
     @context.eval(rows)
     
-    @context.eval('specific1.rows.length').must_equal 6
-    @context.eval('specific1.compactReusedEvents().rows.length').must_equal 6
+    assert_equal 6, @context.eval('specific1.rows.length')
+    assert_equal 6, @context.eval('specific1.compactReusedEvents().rows.length')
     
   end
-  
+
+  def test_remove_duplicate_rows
+
+    rows = "
+      var row1 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':1}});
+      var row2 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':1}});
+      var row3 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':2}});
+      var row4 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':2}});
+
+      var specific = new hqmf.SpecificOccurrence([row1,row2,row3,row4]);
+    "
+
+    @context.eval(rows)
+
+    assert_equal 4, @context.eval('specific.rows.length')
+    assert_equal 2, @context.eval('specific.removeDuplicateRows().rows.length')
+
+  end
+
+  def test_remove_duplicate_rows_no_duplicates
+
+    rows = "
+      var row1 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':1}});
+      var row2 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':2}});
+      var row3 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':3}});
+      var row4 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':4}});
+
+      var specific = new hqmf.SpecificOccurrence([row1,row2,row3,row4]);
+    "
+
+    @context.eval(rows)
+
+    assert_equal 4, @context.eval('specific.rows.length')
+    assert_equal 4, @context.eval('specific.removeDuplicateRows().rows.length')
+
+  end
+
+  def test_remove_duplicate_rows_temp_value
+
+    rows = "
+      var row1 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':1},undefined:{'id':1}});
+      var row2 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':1},undefined:{'id':2}});
+      var row3 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':2},undefined:{'id':1}});
+      var row4 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':2},undefined:{'id':2}});
+      var row5 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':1},undefined:{'id':1}});
+      var row6 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':1},undefined:{'id':2}});
+      var row7 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':2},undefined:{'id':1}});
+      var row8 = new Row('OccurrenceAEncounter',{'OccurrenceAEncounter':{'id':1},'OccurrenceBEncounter':{'id':2},undefined:{'id':2}});
+
+      var specific = new hqmf.SpecificOccurrence([row1,row2,row3,row4,row5,row6,row7,row8]);
+    "
+
+    @context.eval(rows)
+
+    assert_equal 8, @context.eval('specific.rows.length')
+    assert_equal 4, @context.eval('specific.removeDuplicateRows().rows.length')
+
+  end
+
   def test_row_build_rows_for_matching
     
     events = "
@@ -485,22 +566,22 @@ class SpecificsTest < Test::Unit::TestCase
   
     @context.eval(events)
     @context.eval('var rows = Row.buildRowsForMatching(entryKey,entry,boundsKey,bounds)')
-    @context.eval('rows.length').must_equal 8
-    @context.eval('rows[0].values.length').must_equal 2
-    @context.eval('rows[0].values[0].id').must_equal 3
-    @context.eval('rows[0].values[1].id').must_equal 1
-    @context.eval('rows[7].values[0].id').must_equal 3
-    @context.eval('rows[7].values[1].id').must_equal 8
+    assert_equal 8, @context.eval('rows.length')
+    assert_equal 2, @context.eval('rows[0].values.length')
+    assert_equal 3, @context.eval('rows[0].values[0].id')
+    assert_equal 1, @context.eval('rows[0].values[1].id')
+    assert_equal 3, @context.eval('rows[7].values[0].id')
+    assert_equal 8, @context.eval('rows[7].values[1].id')
     @context.eval('var specific = new hqmf.SpecificOccurrence(rows)')
-    @context.eval('specific.rows.length').must_equal 8
-    @context.eval('specific.compactReusedEvents().rows.length').must_equal 7
+    assert_equal 8, @context.eval('specific.rows.length')
+    assert_equal 7, @context.eval('specific.compactReusedEvents().rows.length')
     @context.eval('var rows = Row.buildRowsForMatching(undefined,entry,boundsKey,bounds)')
-    @context.eval('rows.length').must_equal 8
-    @context.eval("rows[0].tempValue.id").must_equal 3
-    @context.eval("rows[5].tempValue.id").must_equal 3
-    @context.eval("rows[0].tempValue.id").must_equal 3
-    @context.eval("rows[0].values[1].id").must_equal 1
-    @context.eval("rows[5].values[1].id").must_equal 6
+    assert_equal 8, @context.eval('rows.length')
+    assert_equal 3, @context.eval("rows[0].nonSpecificLeftMost.id")
+    assert_equal 3, @context.eval("rows[5].nonSpecificLeftMost.id")
+    assert_equal 3, @context.eval("rows[0].nonSpecificLeftMost.id")
+    assert_equal 1, @context.eval("rows[0].values[1].id")
+    assert_equal 6, @context.eval("rows[5].values[1].id")
   end
   
   def test_row_build_for_data_criteria
@@ -512,12 +593,12 @@ class SpecificsTest < Test::Unit::TestCase
   
     @context.eval(events)
     @context.eval('var rows = Row.buildForDataCriteria(entryKey,entries)')
-    @context.eval('rows.length').must_equal 8
-    @context.eval('rows[0].values.length').must_equal 2
-    @context.eval('rows[0].values[0].id').must_equal 1
-    @context.eval('rows[0].values[1]').must_equal '*'
-    @context.eval('rows[7].values[0].id').must_equal 8
-    @context.eval('rows[7].values[1]').must_equal '*'
+    assert_equal 8, @context.eval('rows.length')
+    assert_equal 2, @context.eval('rows[0].values.length')
+    assert_equal 1, @context.eval('rows[0].values[0].id')
+    assert_equal '*', @context.eval('rows[0].values[1]')
+    assert_equal 8, @context.eval('rows[7].values[0].id')
+    assert_equal '*', @context.eval('rows[7].values[1]')
     
   end
   
@@ -538,23 +619,23 @@ class SpecificsTest < Test::Unit::TestCase
     "
     @context.eval(rows)
     @context.eval('var result = specific1.finalizeEvents(specific2,specific3)')
-    @context.eval('result.rows.length').must_equal 3
-    @context.eval('result.rows[0].values[0].id').must_equal 1
-    @context.eval('result.rows[0].values[1].id').must_equal 4
-    @context.eval('result.rows[1].values[0].id').must_equal 1
-    @context.eval('result.rows[1].values[1].id').must_equal 5
-    @context.eval('result.rows[2].values[0].id').must_equal 2
-    @context.eval('result.rows[2].values[1].id').must_equal 4
+    assert_equal 3, @context.eval('result.rows.length')
+    assert_equal 1, @context.eval('result.rows[0].values[0].id')
+    assert_equal 4, @context.eval('result.rows[0].values[1].id')
+    assert_equal 1, @context.eval('result.rows[1].values[0].id')
+    assert_equal 5, @context.eval('result.rows[1].values[1].id')
+    assert_equal 2, @context.eval('result.rows[2].values[0].id')
+    assert_equal 4, @context.eval('result.rows[2].values[1].id')
   
     @context.eval('var result = specific2.finalizeEvents(specific1,specific3)')
-    @context.eval('result.rows.length').must_equal 3
+    assert_equal 3, @context.eval('result.rows.length')
   
     @context.eval('var result = specific1.finalizeEvents(null,specific3)')
-    @context.eval('result.rows.length').must_equal 3
+    assert_equal 3, @context.eval('result.rows.length')
     
     # result if 5 and not 6 becasue the 2/2 row gets dropped
     @context.eval('var result = specific1.finalizeEvents(specific2, null)')
-    @context.eval('result.rows.length').must_equal 5
+    assert_equal 5, @context.eval('result.rows.length')
     
   end
   
@@ -598,10 +679,10 @@ class SpecificsTest < Test::Unit::TestCase
     "
     @context.eval(rows)
     
-    @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop1, hqmf.SpecificsManager.intersectSpecifics(pop2,pop3)))').must_equal true
-    @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop1, hqmf.SpecificsManager.intersectSpecifics(pop2,pop4)))').must_equal false
-    @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop1, hqmf.SpecificsManager.intersectSpecifics(pop2,pop5)))').must_equal false
-    @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop3f,hqmf.SpecificsManager.intersectSpecifics(pop1,pop2)))').must_equal false
+    assert_equal true, @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop1, hqmf.SpecificsManager.intersectSpecifics(pop2,pop3)))')
+    assert_equal false, @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop1, hqmf.SpecificsManager.intersectSpecifics(pop2,pop4)))')
+    assert_equal false, @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop1, hqmf.SpecificsManager.intersectSpecifics(pop2,pop5)))')
+    assert_equal false, @context.eval('hqmf.SpecificsManager.validate(hqmf.SpecificsManager.intersectSpecifics(pop3f,hqmf.SpecificsManager.intersectSpecifics(pop1,pop2)))')
     
   end
 
@@ -634,62 +715,62 @@ class SpecificsTest < Test::Unit::TestCase
     @context.eval(rows)
 
     # test allValuesAny
-    @context.eval('row1.allValuesAny([0,1,2])').must_equal false
-    @context.eval('row1.allValuesAny([1,2])').must_equal true
-    @context.eval('row1.allValuesAny([2])').must_equal true
-    @context.eval('row1.allValuesAny([1])').must_equal true
-    @context.eval('row1.allValuesAny([])').must_equal true
-    @context.eval('identityRow.allValuesAny([0,1,2])').must_equal true
+    assert_equal false, @context.eval('row1.allValuesAny([0,1,2])')
+    assert_equal true, @context.eval('row1.allValuesAny([1,2])')
+    assert_equal true, @context.eval('row1.allValuesAny([2])')
+    assert_equal true, @context.eval('row1.allValuesAny([1])')
+    assert_equal true, @context.eval('row1.allValuesAny([])')
+    assert_equal true, @context.eval('identityRow.allValuesAny([0,1,2])')
 
     # test checkEpisodeOfCare
-    @context.eval('Row.checkEpisodeOfCare({id: 1}, true) == hqmf.SpecificsManager.any').must_equal true
-    @context.eval('Row.checkEpisodeOfCare({id: 1}, false) == hqmf.SpecificsManager.any').must_equal false
-    @context.eval('Row.checkEpisodeOfCare({id: 1}, false).id == 1').must_equal true
+    assert_equal true, @context.eval('Row.checkEpisodeOfCare({id: 1}, true) == hqmf.SpecificsManager.any')
+    assert_equal false, @context.eval('Row.checkEpisodeOfCare({id: 1}, false) == hqmf.SpecificsManager.any')
+    assert_equal true, @context.eval('Row.checkEpisodeOfCare({id: 1}, false).id == 1')
 
     # test intersect
-    @context.eval('row1.intersect(row2,[0,1]).allValuesAny([0,1,2])').must_equal true # this is the critical check.  Make sure we drop bad episode of care intersections
-    @context.eval('row1.intersect(row2,[0]).allValuesAny([2])').must_equal true
-    @context.eval('row1.intersect(row2,[0]).values[0].id == 1').must_equal true
-    @context.eval('row1.intersect(row2,[0]).values[1].id == 3').must_equal true
-    @context.eval('row1.intersect(row2,[1]).allValuesAny([2])').must_equal true
-    @context.eval('row1.intersect(row2,[1]).values[0].id == 1').must_equal true
-    @context.eval('row1.intersect(row2,[1]).values[1].id == 3').must_equal true
-
-    @context.eval('identityRow.intersect(row1,[0]).values[0].id == 1').must_equal true
-    @context.eval('identityRow.intersect(row1,[0]).allValuesAny([1,2])').must_equal true
-    @context.eval('row1.intersect(identityRow,[0]).values[0].id == 1').must_equal true
-    @context.eval('row1.intersect(identityRow,[0]).allValuesAny([1,2])').must_equal true
+    assert_equal true, @context.eval('row1.intersect(row2,[0,1]).allValuesAny([0,1,2])') # this is the critical check.  Make sure we drop bad episode of care intersections
+    assert_equal true, @context.eval('row1.intersect(row2,[0]).allValuesAny([2])')
+    assert_equal true, @context.eval('row1.intersect(row2,[0]).values[0].id == 1')
+    assert_equal true, @context.eval('row1.intersect(row2,[0]).values[1].id == 3')
+    assert_equal true, @context.eval('row1.intersect(row2,[1]).allValuesAny([2])')
+    assert_equal true, @context.eval('row1.intersect(row2,[1]).values[0].id == 1')
+    assert_equal true, @context.eval('row1.intersect(row2,[1]).values[1].id == 3')
+
+    assert_equal true, @context.eval('identityRow.intersect(row1,[0]).values[0].id == 1')
+    assert_equal true, @context.eval('identityRow.intersect(row1,[0]).allValuesAny([1,2])')
+    assert_equal true, @context.eval('row1.intersect(identityRow,[0]).values[0].id == 1')
+    assert_equal true, @context.eval('row1.intersect(identityRow,[0]).allValuesAny([1,2])')
 
     # make sure we drop a bad strggler for encounter 2
-    @context.eval('row1.intersect(row3,[0,1]).allValuesAny([1,2])').must_equal true
-    @context.eval('row1.intersect(row3,[0,1]).values[0].id == 1').must_equal true
+    assert_equal true, @context.eval('row1.intersect(row3,[0,1]).allValuesAny([1,2])')
+    assert_equal true, @context.eval('row1.intersect(row3,[0,1]).values[0].id == 1')
     
     # test intersectSpecifics
 
-    @context.eval('hqmf.SpecificsManager.intersectSpecifics(pop1,pop2).specificContext.rows[0].values[0].id == 1').must_equal true
-    @context.eval('hqmf.SpecificsManager.intersectSpecifics(pop1,pop2).specificContext.rows[0].values[1].id == 3').must_equal true
-    @context.eval('hqmf.SpecificsManager.intersectSpecifics(pop1,pop2).specificContext.rows[0].values[2] == hqmf.SpecificsManager.any').must_equal true
-    @context.eval("hqmf.SpecificsManager.intersectSpecifics(pop1,pop2,['OccurrenceAEncounter1','OccurrenceAEncounter2','OccurrenceAEncounter3']).specificContext.rows[0].allValuesAny([0,1,2])").must_equal true
+    assert_equal true, @context.eval('hqmf.SpecificsManager.intersectSpecifics(pop1,pop2).specificContext.rows[0].values[0].id == 1')
+    assert_equal true, @context.eval('hqmf.SpecificsManager.intersectSpecifics(pop1,pop2).specificContext.rows[0].values[1].id == 3')
+    assert_equal true, @context.eval('hqmf.SpecificsManager.intersectSpecifics(pop1,pop2).specificContext.rows[0].values[2] == hqmf.SpecificsManager.any')
+    assert_equal true, @context.eval("hqmf.SpecificsManager.intersectSpecifics(pop1,pop2,['OccurrenceAEncounter1','OccurrenceAEncounter2','OccurrenceAEncounter3']).specificContext.rows[0].allValuesAny([0,1,2])")
     @context.eval("result = hqmf.SpecificsManager.intersectSpecifics(pop1,pop2,['OccurrenceAEncounter1']).specificContext.rows[0]")
-    @context.eval('result.allValuesAny([2])').must_equal true
-    @context.eval('result.values[0].id == 1').must_equal true
-    @context.eval('result.values[1].id == 3').must_equal true
+    assert_equal true, @context.eval('result.allValuesAny([2])')
+    assert_equal true, @context.eval('result.values[0].id == 1')
+    assert_equal true, @context.eval('result.values[1].id == 3')
     @context.eval("result = hqmf.SpecificsManager.intersectSpecifics(pop1,pop2,['OccurrenceAEncounter2']).specificContext.rows[0]")
-    @context.eval('result.allValuesAny([2])').must_equal true
-    @context.eval('result.values[0].id == 1').must_equal true
-    @context.eval('result.values[1].id == 3').must_equal true
+    assert_equal true, @context.eval('result.allValuesAny([2])')
+    assert_equal true, @context.eval('result.values[0].id == 1')
+    assert_equal true, @context.eval('result.values[1].id == 3')
 
     @context.eval("result = hqmf.SpecificsManager.intersectSpecifics(pop1,pop4,['OccurrenceAEncounter1']).specificContext.rows[0]")
-    @context.eval('result.values[0].id == 1').must_equal true
-    @context.eval('result.allValuesAny([1,2])').must_equal true
+    assert_equal true, @context.eval('result.values[0].id == 1')
+    assert_equal true, @context.eval('result.allValuesAny([1,2])')
 
     @context.eval("result = hqmf.SpecificsManager.intersectSpecifics(pop4,pop1,['OccurrenceAEncounter1']).specificContext.rows[0]")
-    @context.eval('result.values[0].id == 1').must_equal true
-    @context.eval('result.allValuesAny([1,2])').must_equal true
+    assert_equal true, @context.eval('result.values[0].id == 1')
+    assert_equal true, @context.eval('result.allValuesAny([1,2])')
 
     @context.eval("result = hqmf.SpecificsManager.intersectSpecifics(pop1,pop3,['OccurrenceAEncounter1','OccurrenceAEncounter2']).specificContext.rows[0]")
-    @context.eval('result.allValuesAny([1,2])').must_equal true
-    @context.eval('result.values[0].id == 1').must_equal true
+    assert_equal true, @context.eval('result.allValuesAny([1,2])')
+    assert_equal true, @context.eval('result.values[0].id == 1')
 
   end
   
@@ -726,20 +807,20 @@ class SpecificsTest < Test::Unit::TestCase
     assert @context.eval('intersection.isTrue()')
     @context.eval('var result = intersection.specificContext')
     
-    @context.eval('result.rows.length').must_equal 3
+    assert_equal 3, @context.eval('result.rows.length')
   
-    @context.eval('result.rows[0].values[0].id').must_equal 1
-    @context.eval('result.rows[0].values[1].id').must_equal 4
-    @context.eval('result.rows[1].values[0].id').must_equal 1
-    @context.eval('result.rows[1].values[1].id').must_equal 5
-    @context.eval('result.rows[2].values[0].id').must_equal 2
-    @context.eval('result.rows[2].values[1].id').must_equal 4
+    assert_equal 1, @context.eval('result.rows[0].values[0].id')
+    assert_equal 4, @context.eval('result.rows[0].values[1].id')
+    assert_equal 1, @context.eval('result.rows[1].values[0].id')
+    assert_equal 5, @context.eval('result.rows[1].values[1].id')
+    assert_equal 2, @context.eval('result.rows[2].values[0].id')
+    assert_equal 4, @context.eval('result.rows[2].values[1].id')
   
     @context.eval('var intersection = hqmf.SpecificsManager.intersectAll(new Boolean(true), [pop1,pop2,pop3], true)')
     @context.eval('var result = intersection.specificContext')
     
     # 5*5 = 25 - 5 equal rows - 3 non-negated = 17
-    @context.eval('result.rows.length').must_equal 17
+    assert_equal 17, @context.eval('result.rows.length')
     
   end
   
@@ -776,7 +857,7 @@ class SpecificsTest < Test::Unit::TestCase
     assert @context.eval('union.isTrue()')
     @context.eval('var result = union.specificContext')
     
-    @context.eval('result.rows.length').must_equal 8
+    assert_equal 8, @context.eval('result.rows.length')
   
     @context.eval('var union = hqmf.SpecificsManager.unionAll(new Boolean(true), [pop1,pop2,pop3], true)')
     assert @context.eval('union.isTrue()')
@@ -785,7 +866,7 @@ class SpecificsTest < Test::Unit::TestCase
     # originally 5*5, but we remove 1,2 from the left and 2,4,5 from the right
     # that leaves [3,4,5] x [1,3] which is 6 rows... minus the 3,3 row we get 5 rows
     
-    @context.eval('result.rows.length').must_equal 5
+    assert_equal 5, @context.eval('result.rows.length')
   
   end
 
@@ -802,17 +883,17 @@ class SpecificsTest < Test::Unit::TestCase
     "
     @context.eval(rows)
     
-    @context.eval("row1.groupKey()").must_equal "1_*_*_"
-    @context.eval("row1.groupKey('OccurrenceAEncounter')").must_equal "X_*_*_"
-    @context.eval("row1.groupKey('OccurrenceAProcedure')").must_equal "1_*_X_"
-    @context.eval("row2.groupKey()").must_equal "*_2_*_"
-    @context.eval("row2.groupKey('OccurrenceAProcedure')").must_equal "*_2_X_"
-    @context.eval("row3.groupKey()").must_equal "1_4_*_"
-    @context.eval("row3.groupKey('OccurrenceAEncounter')").must_equal "X_4_*_"
-    @context.eval("row3.groupKey('OccurrenceBEncounter')").must_equal "1_X_*_"
-    @context.eval("row3.groupKey('OccurrenceAProcedure')").must_equal "1_4_X_"
-    @context.eval("row4.groupKey()").must_equal "*_*_*_"
-    @context.eval("row4.groupKey('OccurrenceBEncounter')").must_equal "*_X_*_"
+    assert_equal "1_*_*_", @context.eval("row1.groupKey()")
+    assert_equal "X_*_*_", @context.eval("row1.groupKey('OccurrenceAEncounter')")
+    assert_equal "1_*_X_", @context.eval("row1.groupKey('OccurrenceAProcedure')")
+    assert_equal "*_2_*_", @context.eval("row2.groupKey()")
+    assert_equal "*_2_X_", @context.eval("row2.groupKey('OccurrenceAProcedure')")
+    assert_equal "1_4_*_", @context.eval("row3.groupKey()")
+    assert_equal "X_4_*_", @context.eval("row3.groupKey('OccurrenceAEncounter')")
+    assert_equal "1_X_*_", @context.eval("row3.groupKey('OccurrenceBEncounter')")
+    assert_equal "1_4_X_", @context.eval("row3.groupKey('OccurrenceAProcedure')")
+    assert_equal "*_*_*_", @context.eval("row4.groupKey()")
+    assert_equal "*_X_*_", @context.eval("row4.groupKey('OccurrenceBEncounter')")
     
   end
   
@@ -839,13 +920,13 @@ class SpecificsTest < Test::Unit::TestCase
     "
     @context.eval(rows)
     
-    @context.eval("specific1.group()['1_*_'].length").must_equal 2
-    @context.eval("specific1.group()['2_*_'].length").must_equal 3
-    @context.eval("specific1.group()['3_*_'].length").must_equal 1
+    assert_equal 2, @context.eval("specific1.group()['1_*_'].length")
+    assert_equal 3, @context.eval("specific1.group()['2_*_'].length")
+    assert_equal 1, @context.eval("specific1.group()['3_*_'].length")
 
-    @context.eval("specific2.group('OccurrenceAEncounter')['X_1_'].length").must_equal 2
-    @context.eval("specific2.group('OccurrenceAEncounter')['X_2_'].length").must_equal 3
-    @context.eval("specific2.group('OccurrenceAEncounter')['X_3_'].length").must_equal 1
+    assert_equal 2, @context.eval("specific2.group('OccurrenceAEncounter')['X_1_'].length")
+    assert_equal 3, @context.eval("specific2.group('OccurrenceAEncounter')['X_2_'].length")
+    assert_equal 1, @context.eval("specific2.group('OccurrenceAEncounter')['X_3_'].length")
     
   end
   
@@ -866,21 +947,21 @@ class SpecificsTest < Test::Unit::TestCase
                            new Row('OccurrenceAEncounter',{'OccurrenceAEncounter': new hQuery.CodedEntry({_id:15}), 'OccurrenceBEncounter':new hQuery.CodedEntry({'_id':3})})]
     "
     @context.eval(rows)
-    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows).length').must_equal 6
-    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[0].id').must_equal '10'
-    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[1].id').must_equal '11'
-    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[2].id').must_equal '12'
-    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[3].id').must_equal '13'
-    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[4].id').must_equal '14'
-    @context.eval('hqmf.SpecificsManager.extractEvents(undefined, non_specific_rows)[5].id').must_equal '15'
-    
-    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows).length").must_equal 6
-    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[0].id").must_equal '10'
-    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[1].id").must_equal '11'
-    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[2].id").must_equal '12'
-    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[3].id").must_equal '13'
-    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[4].id").must_equal '14'
-    @context.eval("hqmf.SpecificsManager.extractEvents('OccurrenceAEncounter', specific_rows)[5].id").must_equal '15'
+    assert_equal 6, @context.eval('hqmf.SpecificsManager.extractEventsForLeftMost(non_specific_rows).length')
+    assert_equal '10', @context.eval('hqmf.SpecificsManager.extractEventsForLeftMost(non_specific_rows)[0].id')
+    assert_equal '11', @context.eval('hqmf.SpecificsManager.extractEventsForLeftMost(non_specific_rows)[1].id')
+    assert_equal '12', @context.eval('hqmf.SpecificsManager.extractEventsForLeftMost(non_specific_rows)[2].id')
+    assert_equal '13', @context.eval('hqmf.SpecificsManager.extractEventsForLeftMost(non_specific_rows)[3].id')
+    assert_equal '14', @context.eval('hqmf.SpecificsManager.extractEventsForLeftMost(non_specific_rows)[4].id')
+    assert_equal '15', @context.eval('hqmf.SpecificsManager.extractEventsForLeftMost(non_specific_rows)[5].id')
+
+    assert_equal 6, @context.eval("hqmf.SpecificsManager.extractEventsForLeftMost(specific_rows).length")
+    assert_equal '10', @context.eval("hqmf.SpecificsManager.extractEventsForLeftMost(specific_rows)[0].id")
+    assert_equal '11', @context.eval("hqmf.SpecificsManager.extractEventsForLeftMost(specific_rows)[1].id")
+    assert_equal '12', @context.eval("hqmf.SpecificsManager.extractEventsForLeftMost(specific_rows)[2].id")
+    assert_equal '13', @context.eval("hqmf.SpecificsManager.extractEventsForLeftMost(specific_rows)[3].id")
+    assert_equal '14', @context.eval("hqmf.SpecificsManager.extractEventsForLeftMost(specific_rows)[4].id")
+    assert_equal '15', @context.eval("hqmf.SpecificsManager.extractEventsForLeftMost(specific_rows)[5].id")
     
   end
 
@@ -922,68 +1003,68 @@ class SpecificsTest < Test::Unit::TestCase
     lessThanThree = 'new IVL_PQ(null, new PQ(2))'
     exactly1 = 'new IVL_PQ(new PQ(1), new PQ(1))'
     
-    @context.eval("specific1.COUNT(#{moreThanOne}).rows.length").must_equal 5
-    @context.eval("specific1.COUNT(#{moreThanOne}).rows[0].tempValue.id").must_equal '10'
-    @context.eval("specific1.COUNT(#{moreThanOne}).rows[1].tempValue.id").must_equal '11'
-    @context.eval("specific1.COUNT(#{moreThanOne}).rows[2].tempValue.id").must_equal '12'
-    @context.eval("specific1.COUNT(#{moreThanOne}).rows[3].tempValue.id").must_equal '13'
-    @context.eval("specific1.COUNT(#{moreThanOne}).rows[4].tempValue.id").must_equal '14'
-    @context.eval("specific1.COUNT(#{lessThanThree}).rows.length").must_equal 3
-    @context.eval("specific1.COUNT(#{lessThanThree}).rows[0].tempValue.id").must_equal '10'
-    @context.eval("specific1.COUNT(#{lessThanThree}).rows[1].tempValue.id").must_equal '11'
-    @context.eval("specific1.COUNT(#{lessThanThree}).rows[2].tempValue.id").must_equal '15'
-    @context.eval("specific1.COUNT(#{exactly1}).rows.length").must_equal 1
-    @context.eval("specific1.COUNT(#{exactly1}).rows[0].tempValue.id").must_equal '15'
-    
-    @context.eval("specific2.COUNT(#{moreThanOne}).rows.length").must_equal 5
-    @context.eval("specific2.COUNT(#{moreThanOne}).rows[0].values[0].id").must_equal '10'
-    @context.eval("specific2.COUNT(#{moreThanOne}).rows[1].values[0].id").must_equal '11'
-    @context.eval("specific2.COUNT(#{moreThanOne}).rows[2].values[0].id").must_equal '12'
-    @context.eval("specific2.COUNT(#{moreThanOne}).rows[3].values[0].id").must_equal '13'
-    @context.eval("specific2.COUNT(#{moreThanOne}).rows[4].values[0].id").must_equal '14'
-    @context.eval("specific2.COUNT(#{lessThanThree}).rows.length").must_equal 3
-    @context.eval("specific2.COUNT(#{lessThanThree}).rows[0].values[0].id").must_equal '10'
-    @context.eval("specific2.COUNT(#{lessThanThree}).rows[1].values[0].id").must_equal '11'
-    @context.eval("specific2.COUNT(#{lessThanThree}).rows[2].values[0].id").must_equal '15'
-    @context.eval("specific2.COUNT(#{exactly1}).rows.length").must_equal 1
-    @context.eval("specific2.COUNT(#{exactly1}).rows[0].values[0].id").must_equal '15'
-
-    @context.eval("specific3.COUNT(#{exactly1}).rows.length").must_equal 1
-    @context.eval("specific4.COUNT(#{moreThanOne}).rows.length").must_equal 0
+    assert_equal 5, @context.eval("specific1.COUNT(#{moreThanOne}).rows.length")
+    assert_equal '10', @context.eval("specific1.COUNT(#{moreThanOne}).rows[0].nonSpecificLeftMost.id")
+    assert_equal '11', @context.eval("specific1.COUNT(#{moreThanOne}).rows[1].nonSpecificLeftMost.id")
+    assert_equal '12', @context.eval("specific1.COUNT(#{moreThanOne}).rows[2].nonSpecificLeftMost.id")
+    assert_equal '13', @context.eval("specific1.COUNT(#{moreThanOne}).rows[3].nonSpecificLeftMost.id")
+    assert_equal '14', @context.eval("specific1.COUNT(#{moreThanOne}).rows[4].nonSpecificLeftMost.id")
+    assert_equal 3, @context.eval("specific1.COUNT(#{lessThanThree}).rows.length")
+    assert_equal '10', @context.eval("specific1.COUNT(#{lessThanThree}).rows[0].nonSpecificLeftMost.id")
+    assert_equal '11', @context.eval("specific1.COUNT(#{lessThanThree}).rows[1].nonSpecificLeftMost.id")
+    assert_equal '15', @context.eval("specific1.COUNT(#{lessThanThree}).rows[2].nonSpecificLeftMost.id")
+    assert_equal 1, @context.eval("specific1.COUNT(#{exactly1}).rows.length")
+    assert_equal '15', @context.eval("specific1.COUNT(#{exactly1}).rows[0].nonSpecificLeftMost.id")
+    
+    assert_equal 5, @context.eval("specific2.COUNT(#{moreThanOne}).rows.length")
+    assert_equal '10', @context.eval("specific2.COUNT(#{moreThanOne}).rows[0].values[0].id")
+    assert_equal '11', @context.eval("specific2.COUNT(#{moreThanOne}).rows[1].values[0].id")
+    assert_equal '12', @context.eval("specific2.COUNT(#{moreThanOne}).rows[2].values[0].id")
+    assert_equal '13', @context.eval("specific2.COUNT(#{moreThanOne}).rows[3].values[0].id")
+    assert_equal '14', @context.eval("specific2.COUNT(#{moreThanOne}).rows[4].values[0].id")
+    assert_equal 3, @context.eval("specific2.COUNT(#{lessThanThree}).rows.length")
+    assert_equal '10', @context.eval("specific2.COUNT(#{lessThanThree}).rows[0].values[0].id")
+    assert_equal '11', @context.eval("specific2.COUNT(#{lessThanThree}).rows[1].values[0].id")
+    assert_equal '15', @context.eval("specific2.COUNT(#{lessThanThree}).rows[2].values[0].id")
+    assert_equal 1, @context.eval("specific2.COUNT(#{exactly1}).rows.length")
+    assert_equal '15', @context.eval("specific2.COUNT(#{exactly1}).rows[0].values[0].id")
+
+    assert_equal 1, @context.eval("specific3.COUNT(#{exactly1}).rows.length")
+    assert_equal 0, @context.eval("specific4.COUNT(#{moreThanOne}).rows.length")
 
 
     ###
     ##### FIRST
     ###
-    @context.eval("specific1.FIRST().rows.length").must_equal 3
-    @context.eval("specific1.FIRST().rows[0].tempValue.id").must_equal '11'
-    @context.eval("specific1.FIRST().rows[1].tempValue.id").must_equal '12'
-    @context.eval("specific1.FIRST().rows[2].tempValue.id").must_equal '15'
-    
-    @context.eval("specific2.FIRST().rows.length").must_equal 3
-    @context.eval("specific2.FIRST().rows[0].values[0].id").must_equal '11'
-    @context.eval("specific2.FIRST().rows[1].values[0].id").must_equal '12'
-    @context.eval("specific2.FIRST().rows[2].values[0].id").must_equal '15'
+    assert_equal 3, @context.eval("specific1.FIRST().rows.length")
+    assert_equal '11', @context.eval("specific1.FIRST().rows[0].nonSpecificLeftMost.id")
+    assert_equal '12', @context.eval("specific1.FIRST().rows[1].nonSpecificLeftMost.id")
+    assert_equal '15', @context.eval("specific1.FIRST().rows[2].nonSpecificLeftMost.id")
+    
+    assert_equal 3, @context.eval("specific2.FIRST().rows.length")
+    assert_equal '11', @context.eval("specific2.FIRST().rows[0].values[0].id")
+    assert_equal '12', @context.eval("specific2.FIRST().rows[1].values[0].id")
+    assert_equal '15', @context.eval("specific2.FIRST().rows[2].values[0].id")
 
-    @context.eval("specific3.FIRST().rows.length").must_equal 1
-    @context.eval("specific4.FIRST().rows.length").must_equal 0
+    assert_equal 1, @context.eval("specific3.FIRST().rows.length")
+    assert_equal 0, @context.eval("specific4.FIRST().rows.length")
 
     ###
     ##### MOST RECENT
     ###
 
-    @context.eval("specific1.RECENT().rows.length").must_equal 3
-    @context.eval("specific1.RECENT().rows[0].tempValue.id").must_equal '10'
-    @context.eval("specific1.RECENT().rows[1].tempValue.id").must_equal '13'
-    @context.eval("specific1.RECENT().rows[2].tempValue.id").must_equal '15'
-    
-    @context.eval("specific2.RECENT().rows.length").must_equal 3
-    @context.eval("specific2.RECENT().rows[0].values[0].id").must_equal '10'
-    @context.eval("specific2.RECENT().rows[1].values[0].id").must_equal '13'
-    @context.eval("specific2.RECENT().rows[2].values[0].id").must_equal '15'
+    assert_equal 3, @context.eval("specific1.RECENT().rows.length")
+    assert_equal '10', @context.eval("specific1.RECENT().rows[0].nonSpecificLeftMost.id")
+    assert_equal '13', @context.eval("specific1.RECENT().rows[1].nonSpecificLeftMost.id")
+    assert_equal '15', @context.eval("specific1.RECENT().rows[2].nonSpecificLeftMost.id")
+    
+    assert_equal 3, @context.eval("specific2.RECENT().rows.length")
+    assert_equal '10', @context.eval("specific2.RECENT().rows[0].values[0].id")
+    assert_equal '13', @context.eval("specific2.RECENT().rows[1].values[0].id")
+    assert_equal '15', @context.eval("specific2.RECENT().rows[2].values[0].id")
 
-    @context.eval("specific3.RECENT().rows.length").must_equal 1
-    @context.eval("specific4.RECENT().rows.length").must_equal 0
+    assert_equal 1, @context.eval("specific3.RECENT().rows.length")
+    assert_equal 0, @context.eval("specific4.RECENT().rows.length")
 
     
   end