urbanopt-cli 0.4.1 → 0.6.1

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_hvac_sizing.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require_relative '../resources/minitest_helper'
+require 'openstudio'
+require 'openstudio/measure/ShowRunnerOutput'
+require 'fileutils'
+require_relative '../measure.rb'
+require_relative '../resources/util.rb'
+
+class HPXMLtoOpenStudioHVACSizingTest < MiniTest::Test
+  def sample_files_dir
+    return File.join(File.dirname(__FILE__), '..', '..', 'workflow', 'sample_files')
+  end
+
+  def test_slab_f_factor
+    def get_unins_slab()
+      slab = HPXML::Slab.new(nil)
+      slab.thickness = 4.0 # in
+      slab.perimeter_insulation_depth = 0
+      slab.perimeter_insulation_r_value = 0
+      slab.under_slab_insulation_width = 0
+      slab.under_slab_insulation_spans_entire_slab = false
+      slab.under_slab_insulation_r_value = 0
+      return slab
+    end
+
+    # Uninsulated slab
+    slab = get_unins_slab()
+    f_factor = HVACSizing.calc_slab_f_value(slab)
+    assert_in_epsilon(1.41, f_factor, 0.01)
+
+    # R-10, 4ft under slab insulation
+    slab = get_unins_slab()
+    slab.under_slab_insulation_width = 4
+    slab.under_slab_insulation_r_value = 10
+    f_factor = HVACSizing.calc_slab_f_value(slab)
+    assert_in_epsilon(1.27, f_factor, 0.01)
+
+    # R-20, 4ft perimeter insulation
+    slab = get_unins_slab()
+    slab.perimeter_insulation_depth = 4
+    slab.perimeter_insulation_r_value = 20
+    f_factor = HVACSizing.calc_slab_f_value(slab)
+    assert_in_epsilon(0.39, f_factor, 0.01)
+
+    # R-40, whole slab insulation
+    slab = get_unins_slab()
+    slab.under_slab_insulation_spans_entire_slab = true
+    slab.under_slab_insulation_r_value = 40
+    f_factor = HVACSizing.calc_slab_f_value(slab)
+    assert_in_epsilon(1.04, f_factor, 0.01)
+  end
+end

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_lighting.rb

@@ -2,8 +2,7 @@
 
 require_relative '../resources/minitest_helper'
 require 'openstudio'
-require 'openstudio/ruleset/ShowRunnerOutput'
-require 'minitest/autorun'
+require 'openstudio/measure/ShowRunnerOutput'
 require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'
@@ -89,6 +88,7 @@ class HPXMLtoOpenStudioLightingTest < MiniTest::Test
     model = OpenStudio::Model::Model.new
 
     # get arguments
+    args_hash['output_dir'] = 'tests'
     arguments = measure.arguments(model)
     argument_map = OpenStudio::Measure.convertOSArgumentVectorToMap(arguments)
 
@@ -113,6 +113,8 @@ class HPXMLtoOpenStudioLightingTest < MiniTest::Test
 
     hpxml = HPXML.new(hpxml_path: args_hash['hpxml_path'])
 
+    File.delete(File.join(File.dirname(__FILE__), 'in.xml'))
+
     return model, hpxml
   end
 end

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_location.rb

@@ -2,8 +2,7 @@
 
 require_relative '../resources/minitest_helper'
 require 'openstudio'
-require 'openstudio/ruleset/ShowRunnerOutput'
-require 'minitest/autorun'
+require 'openstudio/measure/ShowRunnerOutput'
 require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'
@@ -18,10 +17,10 @@ class HPXMLtoOpenStudioLocationTest < MiniTest::Test
     start_date = run_period_control_daylight_saving_time.startDate
     end_date = run_period_control_daylight_saving_time.endDate
     begin_month = start_date.monthOfYear.value
-    begin_day_of_month = start_date.dayOfMonth
+    begin_day = start_date.dayOfMonth
     end_month = end_date.monthOfYear.value
-    end_day_of_month = end_date.dayOfMonth
-    return begin_month, begin_day_of_month, end_month, end_day_of_month
+    end_day = end_date.dayOfMonth
+    return begin_month, begin_day, end_month, end_day
   end
 
   def test_dst_default
@@ -30,11 +29,11 @@ class HPXMLtoOpenStudioLocationTest < MiniTest::Test
     model, hpxml = _test_measure(args_hash)
 
     assert_equal(1, model.getObjectsByType('OS:RunPeriodControl:DaylightSavingTime'.to_IddObjectType).size)
-    begin_month, begin_day_of_month, end_month, end_day_of_month = get_daylight_saving_month_and_days(model)
+    begin_month, begin_day, end_month, end_day = get_daylight_saving_month_and_days(model)
     assert_equal(3, begin_month)
-    assert_equal(12, begin_day_of_month)
+    assert_equal(12, begin_day)
     assert_equal(11, end_month)
-    assert_equal(5, end_day_of_month)
+    assert_equal(5, end_day)
   end
 
   def test_dst_custom
@@ -43,11 +42,11 @@ class HPXMLtoOpenStudioLocationTest < MiniTest::Test
     model, hpxml = _test_measure(args_hash)
 
     assert_equal(1, model.getObjectsByType('OS:RunPeriodControl:DaylightSavingTime'.to_IddObjectType).size)
-    begin_month, begin_day_of_month, end_month, end_day_of_month = get_daylight_saving_month_and_days(model)
+    begin_month, begin_day, end_month, end_day = get_daylight_saving_month_and_days(model)
     assert_equal(3, begin_month)
-    assert_equal(10, begin_day_of_month)
+    assert_equal(10, begin_day)
     assert_equal(11, end_month)
-    assert_equal(6, end_day_of_month)
+    assert_equal(6, end_day)
   end
 
   def test_dst_disabled
@@ -66,6 +65,7 @@ class HPXMLtoOpenStudioLocationTest < MiniTest::Test
     model = OpenStudio::Model::Model.new
 
     # get arguments
+    args_hash['output_dir'] = 'tests'
     arguments = measure.arguments(model)
     argument_map = OpenStudio::Measure.convertOSArgumentVectorToMap(arguments)
 
@@ -90,6 +90,8 @@ class HPXMLtoOpenStudioLocationTest < MiniTest::Test
 
     hpxml = HPXML.new(hpxml_path: args_hash['hpxml_path'])
 
+    File.delete(File.join(File.dirname(__FILE__), 'in.xml'))
+
     return model, hpxml
   end
 end

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_miscloads.rb

@@ -2,8 +2,7 @@
 
 require_relative '../resources/minitest_helper'
 require 'openstudio'
-require 'openstudio/ruleset/ShowRunnerOutput'
-require 'minitest/autorun'
+require 'openstudio/measure/ShowRunnerOutput'
 require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'
@@ -199,6 +198,7 @@ class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
     model = OpenStudio::Model::Model.new
 
     # get arguments
+    args_hash['output_dir'] = 'tests'
     arguments = measure.arguments(model)
     argument_map = OpenStudio::Measure.convertOSArgumentVectorToMap(arguments)
 
@@ -223,6 +223,8 @@ class HPXMLtoOpenStudioMiscLoadsTest < MiniTest::Test
 
     hpxml = HPXML.new(hpxml_path: args_hash['hpxml_path'])
 
+    File.delete(File.join(File.dirname(__FILE__), 'in.xml'))
+
     return model, hpxml
   end
 end

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_pv.rb

@@ -2,8 +2,7 @@
 
 require_relative '../resources/minitest_helper'
 require 'openstudio'
-require 'openstudio/ruleset/ShowRunnerOutput'
-require 'minitest/autorun'
+require 'openstudio/measure/ShowRunnerOutput'
 require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'
@@ -52,7 +51,7 @@ class HPXMLtoOpenStudioPVTest < MiniTest::Test
 
   def test_pv_shared
     args_hash = {}
-    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-pv-shared.xml'))
+    args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-pv.xml'))
     model, hpxml = _test_measure(args_hash)
 
     hpxml.pv_systems.each do |pv_system|
@@ -80,6 +79,7 @@ class HPXMLtoOpenStudioPVTest < MiniTest::Test
     model = OpenStudio::Model::Model.new
 
     # get arguments
+    args_hash['output_dir'] = 'tests'
     arguments = measure.arguments(model)
     argument_map = OpenStudio::Measure.convertOSArgumentVectorToMap(arguments)
 
@@ -104,6 +104,8 @@ class HPXMLtoOpenStudioPVTest < MiniTest::Test
 
     hpxml = HPXML.new(hpxml_path: args_hash['hpxml_path'])
 
+    File.delete(File.join(File.dirname(__FILE__), 'in.xml'))
+
     return model, hpxml
   end
 end

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_simcontrols.rb

@@ -2,8 +2,7 @@
 
 require_relative '../resources/minitest_helper'
 require 'openstudio'
-require 'openstudio/ruleset/ShowRunnerOutput'
-require 'minitest/autorun'
+require 'openstudio/measure/ShowRunnerOutput'
 require 'fileutils'
 require_relative '../measure.rb'
 require_relative '../resources/util.rb'
@@ -16,10 +15,10 @@ class HPXMLtoOpenStudioSimControlsTest < MiniTest::Test
   def get_run_period_month_and_days(model)
     run_period = model.getRunPeriod
     begin_month = run_period.getBeginMonth
-    begin_day_of_month = run_period.getBeginDayOfMonth
+    begin_day = run_period.getBeginDayOfMonth
     end_month = run_period.getEndMonth
-    end_day_of_month = run_period.getEndDayOfMonth
-    return begin_month, begin_day_of_month, end_month, end_day_of_month
+    end_day = run_period.getEndDayOfMonth
+    return begin_month, begin_day, end_month, end_day
   end
 
   def test_run_period_year
@@ -27,11 +26,11 @@ class HPXMLtoOpenStudioSimControlsTest < MiniTest::Test
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base.xml'))
     model, hpxml = _test_measure(args_hash)
 
-    begin_month, begin_day_of_month, end_month, end_day_of_month = get_run_period_month_and_days(model)
+    begin_month, begin_day, end_month, end_day = get_run_period_month_and_days(model)
     assert_equal(1, begin_month)
-    assert_equal(1, begin_day_of_month)
+    assert_equal(1, begin_day)
     assert_equal(12, end_month)
-    assert_equal(31, end_day_of_month)
+    assert_equal(31, end_day)
   end
 
   def test_run_period_1month
@@ -39,11 +38,11 @@ class HPXMLtoOpenStudioSimControlsTest < MiniTest::Test
     args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-simcontrol-runperiod-1-month.xml'))
     model, hpxml = _test_measure(args_hash)
 
-    begin_month, begin_day_of_month, end_month, end_day_of_month = get_run_period_month_and_days(model)
+    begin_month, begin_day, end_month, end_day = get_run_period_month_and_days(model)
     assert_equal(1, begin_month)
-    assert_equal(1, begin_day_of_month)
+    assert_equal(1, begin_day)
     assert_equal(1, end_month)
-    assert_equal(31, end_day_of_month)
+    assert_equal(31, end_day)
   end
 
   def test_timestep_1hour
@@ -70,6 +69,7 @@ class HPXMLtoOpenStudioSimControlsTest < MiniTest::Test
     model = OpenStudio::Model::Model.new
 
     # get arguments
+    args_hash['output_dir'] = 'tests'
     arguments = measure.arguments(model)
     argument_map = OpenStudio::Measure.convertOSArgumentVectorToMap(arguments)
 
@@ -94,6 +94,8 @@ class HPXMLtoOpenStudioSimControlsTest < MiniTest::Test
 
     hpxml = HPXML.new(hpxml_path: args_hash['hpxml_path'])
 
+    File.delete(File.join(File.dirname(__FILE__), 'in.xml'))
+
     return model, hpxml
   end
 end

data/example_files/resources/hpxml-measures/HPXMLtoOpenStudio/tests/test_validation.rb

@@ -2,33 +2,17 @@
 
 require_relative '../resources/minitest_helper'
 require 'openstudio'
-require 'openstudio/ruleset/ShowRunnerOutput'
-require 'minitest/autorun'
+require 'openstudio/measure/ShowRunnerOutput'
 require 'fileutils'
 require_relative '../measure.rb'
-$has_schematron_nokogiri_gem = false
-begin
-  require 'schematron-nokogiri'
-  $has_schematron_nokogiri_gem = true
-rescue LoadError
-  if ENV['CI'] # Ensure we test via schematron-nokogiri on the CI
-    fail 'Could not load schematron-nokogiri gem. Try running with "bundle exec ruby ...".'
-  else
-    puts 'Could not load schematron-nokogiri gem. Proceeding using ruby validation tests only...'
-  end
-end
 
 class HPXMLtoOpenStudioValidationTest < MiniTest::Test
-  def before_setup
+  def setup
     @root_path = File.absolute_path(File.join(File.dirname(__FILE__), '..', '..'))
 
     # load the Schematron xml
     @stron_path = File.join(@root_path, 'HPXMLtoOpenStudio', 'resources', 'EPvalidator.xml')
-
-    if $has_schematron_nokogiri_gem
-      # make a Schematron object
-      @stron_doc = SchematronNokogiri::Schema.new Nokogiri::XML File.open(@stron_path)
-    end
+    @stron_doc = XMLHelper.parse_file(@stron_path)
 
     # Load all HPXMLs
     hpxml_file_dirs = [File.absolute_path(File.join(@root_path, 'workflow', 'sample_files')),
@@ -37,36 +21,68 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
     @hpxml_docs = {}
     hpxml_file_dirs.each do |hpxml_file_dir|
       Dir["#{hpxml_file_dir}/*.xml"].sort.each do |xml|
-        @hpxml_docs[File.basename(xml)] = HPXML.new(hpxml_path: File.join(hpxml_file_dir, File.basename(xml))).to_oga()
+        @hpxml_docs[File.basename(xml)] = HPXML.new(hpxml_path: File.join(hpxml_file_dir, File.basename(xml)), building_id: 'MyBuilding').to_oga()
       end
     end
 
     # Build up expected error messages hashes by parsing EPvalidator.xml
-    doc = XMLHelper.parse_file(@stron_path)
     @expected_assertions_by_addition = {}
     @expected_assertions_by_deletion = {}
-    XMLHelper.get_elements(doc, '/sch:schema/sch:pattern/sch:rule').each do |rule|
+    @expected_assertions_by_alteration = {}
+    XMLHelper.get_elements(@stron_doc, '/sch:schema/sch:pattern/sch:rule').each do |rule|
       rule_context = XMLHelper.get_attribute_value(rule, 'context')
       context_xpath = rule_context.gsub('h:', '')
 
-      XMLHelper.get_values(rule, 'sch:assert').each do |assertion|
+      XMLHelper.get_elements(rule, 'sch:assert').each do |assertion|
+        assertion_message = assertion.inner_text
         element_name = _get_element_name_for_assertion_test(assertion)
         key = [context_xpath, element_name]
 
-        if assertion.start_with?('Expected 0 element')
+        if assertion_message.start_with?('Expected 0 element')
           # Skipping for now
-        elsif assertion.start_with?('Expected 0 or ') || assertion.partition(': ').last.start_with?('[not') # FIXME: Is there another way to do this?
-          @expected_assertions_by_addition[key] = _get_expected_error_msg(context_xpath, assertion, 'addition')
-        elsif assertion.start_with?('Expected 1 ')
-          @expected_assertions_by_deletion[key] = _get_expected_error_msg(context_xpath, assertion, 'deletion')
-          @expected_assertions_by_addition[key] = _get_expected_error_msg(context_xpath, assertion, 'addition')
+        elsif assertion_message.start_with?('Expected 0 or ')
+          @expected_assertions_by_addition[key] = _get_expected_error_msg(context_xpath, assertion_message, 'addition')
+        elsif assertion_message.start_with?('Expected 1 ')
+          @expected_assertions_by_deletion[key] = _get_expected_error_msg(context_xpath, assertion_message, 'deletion')
+          @expected_assertions_by_addition[key] = _get_expected_error_msg(context_xpath, assertion_message, 'addition')
+        elsif assertion_message.include?("Expected #{element_name} to be")
+          @expected_assertions_by_alteration[key] = _get_expected_error_msg(context_xpath, assertion_message, 'alteration')
+        elsif assertion_message.include?('There must be at least one') || assertion_message.include?('A location is specified as') || assertion_message.include?('sum of')
+          # Skip these complex rules
         else
-          fail "Unexpected assertion: '#{assertion}'."
+          fail "Unexpected assertion: '#{assertion_message}'."
         end
       end
     end
   end
 
+  def test_role_attributes
+    puts
+    puts 'Checking for correct role attributes...'
+
+    # check that every assert element has a role attribute
+    XMLHelper.get_elements(@stron_doc, '/sch:schema/sch:pattern/sch:rule/sch:assert').each do |assert_element|
+      assert_test = XMLHelper.get_attribute_value(assert_element, 'test').gsub('h:', '')
+      role_attribute = XMLHelper.get_attribute_value(assert_element, 'role')
+      if role_attribute.nil?
+        fail "No attribute \"role='ERROR'\" found for assertion test: #{assert_test}"
+      end
+
+      assert_equal('ERROR', role_attribute)
+    end
+
+    # check that every report element has a role attribute
+    XMLHelper.get_elements(@stron_doc, '/sch:schema/sch:pattern/sch:rule/sch:report').each do |report_element|
+      report_test = XMLHelper.get_attribute_value(report_element, 'test').gsub('h:', '')
+      role_attribute = XMLHelper.get_attribute_value(report_element, 'role')
+      if role_attribute.nil?
+        fail "No attribute \"role='WARN'\" found for report test: #{report_test}"
+      end
+
+      assert_equal('WARN', role_attribute)
+    end
+  end
+
   def test_sample_files
     puts
     puts "Testing #{@hpxml_docs.size} HPXML files..."
@@ -75,8 +91,7 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
 
       # Test validation
       _test_schema_validation(hpxml_doc, xml)
-      _test_schematron_validation(@stron_doc, hpxml_doc.to_xml) if $has_schematron_nokogiri_gem
-      _test_ruby_validation(hpxml_doc)
+      _test_schematron_validation(hpxml_doc)
     end
     puts
   end
@@ -93,8 +108,7 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
       XMLHelper.delete_element(parent_element, child_element_name)
 
       # Test validation
-      _test_ruby_validation(hpxml_doc, expected_error_msg)
-      _test_schematron_validation(@stron_doc, hpxml_doc.to_xml, expected_error_msg) if $has_schematron_nokogiri_gem
+      _test_schematron_validation(hpxml_doc, expected_error_msg)
     end
     puts
   end
@@ -125,39 +139,57 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
       (max_number_of_elements_allowed + 1).times { mod_parent_element.children << duplicated }
 
       # Test validation
-      _test_schematron_validation(@stron_doc, hpxml_doc.to_xml, expected_error_msg) if $has_schematron_nokogiri_gem
-      _test_ruby_validation(hpxml_doc, expected_error_msg)
+      _test_schematron_validation(hpxml_doc, expected_error_msg)
     end
     puts
   end
 
-  private
+  def test_schematron_asserts_by_alteration
+    puts "Testing #{@expected_assertions_by_alteration.size} Schematron asserts by alteration..."
 
-  def _test_schematron_validation(stron_doc, hpxml, expected_error_msg = nil)
-    # Validate via schematron-nokogiri gem
-    xml_doc = Nokogiri::XML hpxml
-    results = stron_doc.validate xml_doc
-    results_msgs = results.map { |i| i[:message].gsub(': ', [': ', i[:context_path].gsub('h:', '').concat(': ')].join('')) }
-    idx_of_msg = results_msgs.index { |m| m == expected_error_msg }
-    if expected_error_msg.nil?
-      assert_nil(idx_of_msg)
-    else
-      if idx_of_msg.nil?
-        puts "Did not find expected error message '#{expected_error_msg}' in #{results_msgs}."
+    # Tests by element alteration
+    @expected_assertions_by_alteration.each do |key, expected_error_msg|
+      print '.'
+      hpxml_doc, parent_element = _get_hpxml_doc_and_parent_element(key)
+      child_element_name = key[1]
+      element_to_be_altered = XMLHelper.get_element(parent_element, child_element_name)
+      element_to_be_altered.inner_text = element_to_be_altered.inner_text + 'foo' # add arbitrary string to make the value invalid
+
+      # Test validation
+      _test_schematron_validation(hpxml_doc, expected_error_msg)
+    end
+    puts
+  end
+
+  def test_schematron_validation
+    # Check that the schematron file is valid
+
+    hpxml_stron_path = File.join(@root_path, 'HPXMLtoOpenStudio', 'resources', 'HPXMLvalidator.xml')
+
+    begin
+      require 'schematron-nokogiri'
+
+      [@stron_path, hpxml_stron_path].each do |s_path|
+        xml_doc = Nokogiri::XML(File.open(s_path)) do |config|
+          config.options = Nokogiri::XML::ParseOptions::STRICT
+        end
+        stron_doc = SchematronNokogiri::Schema.new(xml_doc)
       end
-      refute_nil(idx_of_msg)
+    rescue LoadError
     end
   end
 
-  def _test_ruby_validation(hpxml_doc, expected_error_msg = nil)
+  private
+
+  def _test_schematron_validation(hpxml_doc, expected_error_msg = nil)
     # Validate via validator.rb
-    results = Validator.run_validator(hpxml_doc, @stron_path)
-    idx_of_msg = results.index { |i| i == expected_error_msg }
+    errors, warnings = Validator.run_validators(hpxml_doc, [@stron_path])
+    idx_of_msg = errors.index { |i| i == expected_error_msg }
     if expected_error_msg.nil?
       assert_nil(idx_of_msg)
     else
       if idx_of_msg.nil?
-        puts "Did not find expected error message '#{expected_error_msg}' in #{results}."
+        puts "Did not find expected error message '#{expected_error_msg}' in #{errors}."
       end
       refute_nil(idx_of_msg)
     end
@@ -178,6 +210,10 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
 
     # Find a HPXML file that contains the specified elements.
     @hpxml_docs.each do |xml, hpxml_doc|
+      if context_xpath.include? 'HeatPump[HeatPumpType="water-loop-to-air"]'
+        next unless xml.include? 'boiler-only'
+      end
+
       parent_elements = XMLHelper.get_elements(hpxml_doc, context_xpath)
       next if parent_elements.nil?
 
@@ -194,26 +230,30 @@ class HPXMLtoOpenStudioValidationTest < MiniTest::Test
     fail "Could not find an HPXML file with #{element_name} in #{context_xpath}. Add this to a HPXML file so that it's tested."
   end
 
-  def _get_expected_error_msg(parent_xpath, assertion, mode)
-    if assertion.start_with?('Expected 0 or more')
+  def _get_expected_error_msg(parent_xpath, assertion_message, mode)
+    if assertion_message.start_with?('Expected 0 or more')
       return
-    elsif assertion.start_with?('Expected 1 or more') && (mode == 'addition')
+    elsif assertion_message.start_with?('Expected 1 or more') && (mode == 'addition')
       return
     else
-      return [[assertion.partition(': ').first, parent_xpath].join(': '), assertion.partition(': ').last].join(': ') # return "Expected x element(s) for xpath: foo: bar"
+      return [assertion_message, "[context: #{parent_xpath}]"].join(' ') # return "Expected x element(s) for xpath: foo... [context: bar/baz/...]"
     end
   end
 
   def _get_element_name_for_assertion_test(assertion)
     # From the assertion, get the element name to be added or deleted for the assertion test.
-    if assertion.partition(': ').last.start_with?('[not')
-      element_name = assertion.partition(': ').last.partition(' | ').last
+    if assertion.inner_text.start_with?('Expected') && assertion.inner_text.include?('to be')
+      test_attr = assertion.get('test')
+      element_name = test_attr[/not\((.*?)\)/m, 1].gsub('h:', '') # pull text between "not(" and ")" (i.e. "foo" from "not(h:foo)")
+
+      return element_name
     else
-      element_name = assertion.partition(': ').last.partition(' | ').first
+      test_attr = assertion.get('test')
+      element_name = test_attr[/(?<=\().*(?=\))/].gsub('h:', '').partition(') + count').first # pull text between the first opening and the last closing parenthesis. (i.e. "foo" from "count(foo) + count(bar)...")
       _balance_brackets(element_name)
-    end
 
-    return element_name
+      return element_name
+    end
   end
 
   def _balance_brackets(element_name)