Merge pull request #219 from emiliom/tests-fix-nwis-wof

Fix NWIS and WOF tests
ulmo-dev · Jun 2, 2023 · fcdb717 · fcdb717
2 parents 74da11f + e10df03
commit fcdb717
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/test/usgs_nwis_test.py b/test/usgs_nwis_test.py
@@ -30,7 +30,7 @@ def test_get_sites_by_county_code():
 
 
 def test_get_sites_by_huc():
- huc='02070010'
+ huc = '02070010'
  sites_data_file = 'usgs/nwis/sites_huc_%s_daily.xml' % huc
  with test_util.mocked_urls(sites_data_file):
  sites = ulmo.usgs.nwis.get_sites(huc=huc, service='dv')
@@ -40,7 +40,7 @@ def test_get_sites_by_huc():
 def test_get_sites_with_extra_kwarg():
  sites_data_file = 'usgs/nwis/sites_kwarg_agencyCD.xml'
  with test_util.mocked_urls(sites_data_file):
- sites = ulmo.usgs.nwis.get_sites(state_code='TX', agencyCD='USCE', service='dv')
+ sites = ulmo.usgs.nwis.get_sites(state_code='TX', agencyCD='USCE')
  assert len(sites) == 1
 
 

diff --git a/test/wof_test.py b/test/wof_test.py
@@ -134,7 +134,7 @@ def test_core_get_values_waterml_1_1():
  }
  }
  assert values['methods'] == {'21': {'code': '21', 'description': '6"" Glass Thermometer, Centigrade Scale', 'id': '21'}}
- assert values['sources'] == {'1': {'id': '1', 'code': '1', 'organization': 'Ipswich River Watershed Association', 'description': 'The Ipswich River Watershed Association (IRWA) is the voice of the Ipswich River.� IRWA works to protect nature and make sure that there is enough clean water for people, fish and wildlife, today and for our children and theirs.', 'topic_category': 'inlandWaters', 'title': 'Ipswich River RiverWatch Program', 'abstract': 'The RiverWatch program, in operation since 1997, enlists a group of volunteers to collect water quality data on the Ipswich River and its tributaries. The purpose of the program is to establish baseline data in order to identify and address impairments to water quality and quantity, as well as to promote awareness and stewardship of the river. Volunteers monitor according to a state-approved monitoring plan that ensures that the data collected is of good quality. The goals of the program are to document River conditions in order to identify water quality problems (including adequate river flow) and to use this data to develop solutions to observed problems. A Quality Assurance Project Plan (QAPP) was finalized in 1999 and most recently updated in 2013. ', 'profile_version': 'Unknown', 'metadata_link': 'http:https://ipswich-river.org/resources/monitoring-data/', 'contact_name': "Ryan O'Donnell", 'type_of_contact': 'main', 'email': '[email protected]', 'phone': '978-412-8200', 'address': 'P.O. Box 576,143 County Rd.\n,Ipswich, MA 01938-2557', 'link': 'http:https://www.ipswichriver.org', 'citation': 'RiverWatch Water Quality Volunteer Monitoring Program Annual Results Reports. http:https://ipswichriver.org/resources/monitoring-data/'}}
+ assert values['sources'] == {'1': {'id': '1', 'code': '1', 'organization': 'Ipswich River Watershed Association', 'description': 'The Ipswich River Watershed Association (IRWA) is the voice of the Ipswich River. IRWA works to protect nature and make sure that there is enough clean water for people, fish and wildlife, today and for our children and theirs.', 'topic_category': 'inlandWaters', 'title': 'Ipswich River RiverWatch Program', 'abstract': 'The RiverWatch program, in operation since 1997, enlists a group of volunteers to collect water quality data on the Ipswich River and its tributaries. The purpose of the program is to establish baseline data in order to identify and address impairments to water quality and quantity, as well as to promote awareness and stewardship of the river. Volunteers monitor according to a state-approved monitoring plan that ensures that the data collected is of good quality. The goals of the program are to document River conditions in order to identify water quality problems (including adequate river flow) and to use this data to develop solutions to observed problems. A Quality Assurance Project Plan (QAPP) was finalized in 1999 and most recently updated in 2013. ', 'profile_version': 'Unknown', 'metadata_link': 'http:https://ipswich-river.org/resources/monitoring-data/', 'contact_name': "Ryan O'Donnell", 'type_of_contact': 'main', 'email': '[email protected]', 'phone': '978-412-8200', 'address': 'P.O. Box 576,143 County Rd.\n,Ipswich, MA 01938-2557', 'link': 'http:https://www.ipswichriver.org', 'citation': 'RiverWatch Water Quality Volunteer Monitoring Program Annual Results Reports. http:https://ipswichriver.org/resources/monitoring-data/'}}
 
 
 def test_core_get_variable_info_waterml_single_1_0():