jenkins-bot has submitted this change and it was merged.
Change subject: Add test for checkLat/checkLon and test checkers/converters are
triggered
......................................................................
Add test for checkLat/checkLon and test checkers/converters are triggered
This is in preparation of the re-factoring done in
I28895b6cc94e87af68f88b455ef2a431d4b5f00a .
The longitude tests are almost identical to the latitude tests since the
two calls don't share any code (yet). It should be possible to do this in
a better way but I'm unsure how this would trigger setUp() tearDown() calls.
Note that this includes the test_trigger_problematic_check which is
expected to fail once the re-factoring is done.
Also:
* Make TestLookupSourceField use differently named source/dest values
for clarity. And as a result changed function name.
* Change all assert_called_with to assert_called_once_with to make it
explicit that only a single call is expected.
* Add test for lat_no_lon and lon_no_lat warnings.
Change-Id: I8f48c744ee7ce5d57ddce7f12e18d5ada41c75ce
---
M tests/test_update_database.py
1 file changed, 324 insertions(+), 8 deletions(-)
Approvals:
Jean-Frédéric: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/test_update_database.py b/tests/test_update_database.py
index 6fdca00..f81c864 100644
--- a/tests/test_update_database.py
+++ b/tests/test_update_database.py
@@ -65,7 +65,7 @@
with mock.patch('erfgoedbot.update_database.updateMonument',
autospec=True) as mock_updateMonument:
result = update_database.processMonument(params, self.source,
self.country_config, None, self.mock_cursor, self.mock_page, header_defaults)
- mock_updateMonument.assert_called_with(expected_contents,
'DummySource', self.country_config, None, self.mock_cursor, self.mock_page)
+ mock_updateMonument.assert_called_once_with(expected_contents,
'DummySource', self.country_config, None, self.mock_cursor, self.mock_page)
self.assertEqual(result, {u'some_unknown_field': 1})
@@ -82,7 +82,7 @@
update_database.updateMonument(contents, source, self.country_config,
None, self.mock_cursor, self.mock_page)
expected_query = u'REPLACE INTO `dummy_table`(`source`, `id`, `name`)
VALUES (%s, %s, %s)'
expected_query_params = ['DummySource', u'1234', u'A Monument Name']
- self.mock_cursor.execute.assert_called_with(expected_query,
expected_query_params)
+ self.mock_cursor.execute.assert_called_once_with(expected_query,
expected_query_params)
class TestProcessHeader(TestUpdateDatabaseBase):
@@ -99,13 +99,22 @@
class TestLookupSourceField(TestUpdateDatabaseBase):
- def test_lookupSourceField_on_unknown_field_resturn_none(self):
+ def setUp(self):
+ super(TestLookupSourceField, self).setUp()
+ self.country_config['fields'].append(
+ {
+ 'source': u'source-name',
+ 'dest': u'dest-name',
+ }
+ )
+
+ def test_lookupSourceField_on_unknown_field_return_none(self):
result = update_database.lookupSourceField("unknown",
self.country_config)
self.assertEqual(result, None)
- def test_lookupSourceField_on_known_field_resturn_dest(self):
- result = update_database.lookupSourceField(u'name',
self.country_config)
- self.assertEqual(result, 'name')
+ def test_lookupSourceField_on_known_field_return_source(self):
+ result = update_database.lookupSourceField(u'dest-name',
self.country_config)
+ self.assertEqual(result, 'source-name')
class TestProcessPage(TestUpdateDatabaseBase):
@@ -125,15 +134,322 @@
self.country_config['headerTemplate'] = 'MockTemplate'
with mock.patch('erfgoedbot.update_database.processHeader',
autospec=True) as mock_processHeader:
update_database.processPage(self.mock_page, self.source,
self.country_config, None, None)
- mock_processHeader.assert_called_with(['a', 'b'],
self.country_config)
+ mock_processHeader.assert_called_once_with(['a', 'b'],
self.country_config)
def test_processPage_calls_processMonument(self):
self.country_config['rowTemplate'] = 'MockTemplate'
with mock.patch('erfgoedbot.update_database.processMonument',
autospec=True) as mock_processMonument:
update_database.processPage(self.mock_page, self.source,
self.country_config, None, None)
- mock_processMonument.assert_called_with(
+ mock_processMonument.assert_called_once_with(
['a', 'b'],
self.source,
self.country_config,
None, None, self.mock_page, {}, unknownFields={}
)
+
+
+class TestCountryBboxRequireLatLon(TestUpdateDatabaseBase):
+
+ def setUp(self):
+ super(TestCountryBboxRequireLatLon, self).setUp()
+ # why require countryBbox to trigger this?
+ self.country_config['countryBbox'] = u'8.5,10.5,28.0,60.0'
+ self.monumentKey = 'some-key'
+ self.source = 'DummySource'
+ self.contents = {
+ 'title': 'MockPageTitle',
+ u'id': self.monumentKey,
+ u'name': u'A Monument Name',
+ 'source': self.source
+ }
+
+ def test_countryBbox_no_lat_or_lon(self):
+ with mock.patch('erfgoedbot.update_database.reportDataError',
autospec=True) as mock_reportDataError:
+ update_database.updateMonument(self.contents, self.source,
self.country_config, None, self.mock_cursor, self.mock_page)
+ assert not mock_reportDataError.called # mock 3.5 has
assert_not_called()
+
+ def test_countryBbox_lat_no_lon(self):
+ self.country_config['fields'].append(
+ {
+ 'source': u'lat',
+ 'dest': u'lat',
+ }
+ )
+ self.contents['lat'] = '123'
+ expected_errorMsg = u"Longitude is not set for monument %s." %
self.monumentKey
+
+ with mock.patch('erfgoedbot.update_database.reportDataError',
autospec=True) as mock_reportDataError:
+ update_database.updateMonument(self.contents, self.source,
self.country_config, None, self.mock_cursor, self.mock_page)
+ mock_reportDataError.assert_called_once_with(expected_errorMsg,
self.mock_page, self.monumentKey)
+
+ def test_countryBbox_lon_no_lat(self):
+ self.country_config['fields'].append(
+ {
+ 'source': u'lon',
+ 'dest': u'lon',
+ }
+ )
+ self.contents['lon'] = '123'
+ expected_errorMsg = u"Latitude is not set for monument %s." %
self.monumentKey
+
+ with mock.patch('erfgoedbot.update_database.reportDataError',
autospec=True) as mock_reportDataError:
+ update_database.updateMonument(self.contents, self.source,
self.country_config, None, self.mock_cursor, self.mock_page)
+ mock_reportDataError.assert_called_once_with(expected_errorMsg,
self.mock_page, self.monumentKey)
+
+ def test_countryBbox_lat_and_lon(self):
+ self.country_config['fields'] += [
+ {
+ 'source': u'lat',
+ 'dest': u'lat',
+ },
+ {
+ 'source': u'lon',
+ 'dest': u'lon',
+ },
+ ]
+ self.contents['lat'] = '123'
+ self.contents['lon'] = '123'
+
+ with mock.patch('erfgoedbot.update_database.reportDataError',
autospec=True) as mock_reportDataError:
+ update_database.updateMonument(self.contents, self.source,
self.country_config, None, self.mock_cursor, self.mock_page)
+ assert not mock_reportDataError.called # mock 3.5 has
assert_not_called()
+
+
+class TestTriggerConversion(TestUpdateDatabaseBase):
+
+ def test_call_convertField(self):
+ new_field = {
+ 'source': u'source-name',
+ 'dest': u'dest-name',
+ 'conv': 'some-converter',
+ }
+ self.country_config['fields'].append(new_field)
+ source = 'DummySource'
+ contents = {
+ 'title': 'MockPageTitle',
+ u'id': u'1234',
+ u'name': u'A Monument Name',
+ 'source-name': u'Some value',
+ 'source': source
+ }
+
+ with mock.patch('erfgoedbot.update_database.convertField',
autospec=True) as mock_convertField:
+ update_database.updateMonument(contents, source,
self.country_config, None, self.mock_cursor, self.mock_page)
+ mock_convertField.assert_called_once_with(new_field, contents,
self.country_config)
+
+
+class TestTriggerChecks(TestUpdateDatabaseBase):
+
+ def setUp(self):
+ super(TestTriggerChecks, self).setUp()
+ self.monumentKey = 'some-key'
+ self.source = 'DummySource'
+ self.contents = {
+ 'title': 'MockPageTitle',
+ u'id': self.monumentKey,
+ u'name': u'A Monument Name',
+ 'source': self.source
+ }
+
+ def test_trigger_checkLat(self):
+ self.country_config['fields'].append(
+ {
+ 'source': u'lat',
+ 'dest': u'lat',
+ 'check': u'checkLat',
+ }
+ )
+ lat = '13.37'
+ self.contents[u'lat'] = lat
+
+ with mock.patch('erfgoedbot.update_database.checkLat', autospec=True)
as mock_checkLat:
+ update_database.updateMonument(self.contents, self.source,
self.country_config, None, self.mock_cursor, self.mock_page)
+ mock_checkLat.assert_called_once_with(lat, self.monumentKey,
self.country_config, self.mock_page)
+
+ def test_trigger_checkLon(self):
+ self.country_config['fields'].append(
+ {
+ 'source': u'lon',
+ 'dest': u'lon',
+ 'check': u'checkLon',
+ }
+ )
+ lon = '-13.37'
+ self.contents[u'lon'] = lon
+
+ with mock.patch('erfgoedbot.update_database.checkLon', autospec=True)
as mock_checkLon:
+ update_database.updateMonument(self.contents, self.source,
self.country_config, None, self.mock_cursor, self.mock_page)
+ mock_checkLon.assert_called_once_with(lon, self.monumentKey,
self.country_config, self.mock_page)
+
+ def test_trigger_unknown_check(self):
+ self.country_config['fields'].append(
+ {
+ 'source': u'source-field',
+ 'dest': u'dest-field',
+ 'check': u'unknown',
+ }
+ )
+ val = 'something'
+ self.contents[u'source-field'] = val
+
+ with self.assertRaises(KeyError) as cm:
+ update_database.updateMonument(self.contents, self.source,
self.country_config, None, self.mock_cursor, self.mock_page)
+ self.assertEqual(cm.exception, u'unknown')
+
+ def test_trigger_problematic_check(self):
+ # It is a known bug that any function can be triggered using a check
+ self.country_config['fields'].append(
+ {
+ 'source': u'source-field',
+ 'dest': u'dest-field',
+ 'check': u'connectDatabase',
+ }
+ )
+ val = 'something'
+ self.contents[u'source-field'] = val
+
+ with mock.patch('erfgoedbot.update_database.connectDatabase',
autospec=False) as mock_connectDatabase:
+ update_database.updateMonument(self.contents, self.source,
self.country_config, None, self.mock_cursor, self.mock_page)
+ mock_connectDatabase.assert_called_once_with(val,
self.monumentKey, self.country_config, self.mock_page)
+
+
+class TestCheckLatNoCountryBbox(TestUpdateDatabaseBase):
+
+ def setUp(self):
+ super(TestCheckLatNoCountryBbox, self).setUp()
+ self.monumentKey = 'Some-key'
+
+ def test_empty_lat(self):
+ lat = ''
+ result = update_database.checkLat(lat, self.monumentKey,
self.country_config, self.mock_page)
+ self.assertEqual(result, None)
+
+ def test_non_float_lat(self):
+ lat = 'some_string'
+ expected_errorMsg = u"Invalid latitude value: %s for monument %s" % (
+ lat, self.monumentKey)
+ with mock.patch('erfgoedbot.update_database.reportDataError',
autospec=True) as mock_reportDataError:
+ result = update_database.checkLat(lat, self.monumentKey,
self.country_config, self.mock_page)
+ mock_reportDataError.assert_called_once_with(expected_errorMsg,
self.mock_page, self.monumentKey)
+ self.assertEqual(result, False)
+
+ def test_positive_out_of_bounds_lat(self):
+ lat = '90.1'
+ expected_errorMsg = u"Latitude for monument %s out of range: %s" % (
+ self.monumentKey, lat)
+ with mock.patch('erfgoedbot.update_database.reportDataError',
autospec=True) as mock_reportDataError:
+ result = update_database.checkLat(lat, self.monumentKey,
self.country_config, self.mock_page)
+ mock_reportDataError.assert_called_once_with(expected_errorMsg,
self.mock_page, self.monumentKey)
+ self.assertEqual(result, False)
+
+ def test_negative_out_of_bounds_lat(self):
+ lat = '-90.1'
+ expected_errorMsg = u"Latitude for monument %s out of range: %s" % (
+ self.monumentKey, lat)
+ with mock.patch('erfgoedbot.update_database.reportDataError',
autospec=True) as mock_reportDataError:
+ result = update_database.checkLat(lat, self.monumentKey,
self.country_config, self.mock_page)
+ mock_reportDataError.assert_called_once_with(expected_errorMsg,
self.mock_page, self.monumentKey)
+ self.assertEqual(result, False)
+
+ def test_valid_int_lat(self):
+ lat = '85'
+ result = update_database.checkLat(lat, self.monumentKey,
self.country_config, self.mock_page)
+ self.assertEqual(result, True)
+
+ def test_valid_float_lat(self):
+ lat = '-13.37'
+ result = update_database.checkLat(lat, self.monumentKey,
self.country_config, self.mock_page)
+ self.assertEqual(result, True)
+
+
+class TestCheckLatWithCountryBbox(TestUpdateDatabaseBase):
+
+ def setUp(self):
+ super(TestCheckLatWithCountryBbox, self).setUp()
+ self.country_config['countryBbox'] = u'8.5,10.5,28.0,60.0'
+ self.monumentKey = 'Some-key'
+
+ def test_lat_outside_Bbox(self):
+ lat = '-1.337'
+ expected_errorMsg = u"Latitude for monument %s out of country area:
%s" % (
+ self.monumentKey, lat)
+ with mock.patch('erfgoedbot.update_database.reportDataError',
autospec=True) as mock_reportDataError:
+ result = update_database.checkLat(lat, self.monumentKey,
self.country_config, self.mock_page)
+ mock_reportDataError.assert_called_once_with(expected_errorMsg,
self.mock_page, self.monumentKey)
+ self.assertEqual(result, False)
+
+ def test_lat_inside_Bbox(self):
+ lat = '13.37'
+ result = update_database.checkLat(lat, self.monumentKey,
self.country_config, self.mock_page)
+ self.assertEqual(result, True)
+
+
+class TestCheckLonNoCountryBbox(TestUpdateDatabaseBase):
+
+ def setUp(self):
+ super(TestCheckLonNoCountryBbox, self).setUp()
+ self.monumentKey = 'Some-key'
+
+ def test_empty_lon(self):
+ lon = ''
+ result = update_database.checkLon(lon, self.monumentKey,
self.country_config, self.mock_page)
+ self.assertEqual(result, None)
+
+ def test_non_float_lon(self):
+ lon = 'some_string'
+ expected_errorMsg = u"Invalid longitude value: %s for monument %s" % (
+ lon, self.monumentKey)
+ with mock.patch('erfgoedbot.update_database.reportDataError',
autospec=True) as mock_reportDataError:
+ result = update_database.checkLon(lon, self.monumentKey,
self.country_config, self.mock_page)
+ mock_reportDataError.assert_called_once_with(expected_errorMsg,
self.mock_page, self.monumentKey)
+ self.assertEqual(result, False)
+
+ def test_positive_out_of_bounds_lon(self):
+ lon = '180.1'
+ expected_errorMsg = u"Longitude for monument %s out of range: %s" % (
+ self.monumentKey, lon)
+ with mock.patch('erfgoedbot.update_database.reportDataError',
autospec=True) as mock_reportDataError:
+ result = update_database.checkLon(lon, self.monumentKey,
self.country_config, self.mock_page)
+ mock_reportDataError.assert_called_once_with(expected_errorMsg,
self.mock_page, self.monumentKey)
+ self.assertEqual(result, False)
+
+ def test_negative_out_of_bounds_lon(self):
+ lon = '-180.1'
+ expected_errorMsg = u"Longitude for monument %s out of range: %s" % (
+ self.monumentKey, lon)
+ with mock.patch('erfgoedbot.update_database.reportDataError',
autospec=True) as mock_reportDataError:
+ result = update_database.checkLon(lon, self.monumentKey,
self.country_config, self.mock_page)
+ mock_reportDataError.assert_called_once_with(expected_errorMsg,
self.mock_page, self.monumentKey)
+ self.assertEqual(result, False)
+
+ def test_valid_int_lon(self):
+ lon = '85'
+ result = update_database.checkLon(lon, self.monumentKey,
self.country_config, self.mock_page)
+ self.assertEqual(result, True)
+
+ def test_valid_float_lon(self):
+ lon = '-13.37'
+ result = update_database.checkLon(lon, self.monumentKey,
self.country_config, self.mock_page)
+ self.assertEqual(result, True)
+
+
+class TestCheckLonWithCountryBbox(TestUpdateDatabaseBase):
+
+ def setUp(self):
+ super(TestCheckLonWithCountryBbox, self).setUp()
+ self.country_config['countryBbox'] = u'8.5,10.5,28.0,60.0'
+ self.monumentKey = 'Some-key'
+
+ def test_lon_outside_Bbox(self):
+ lon = '-1.337'
+ expected_errorMsg = u"Longitude for monument %s out of country area:
%s" % (
+ self.monumentKey, lon)
+ with mock.patch('erfgoedbot.update_database.reportDataError',
autospec=True) as mock_reportDataError:
+ result = update_database.checkLon(lon, self.monumentKey,
self.country_config, self.mock_page)
+ mock_reportDataError.assert_called_once_with(expected_errorMsg,
self.mock_page, self.monumentKey)
+ self.assertEqual(result, False)
+
+ def test_lon_inside_Bbox(self):
+ lon = '13.37'
+ result = update_database.checkLon(lon, self.monumentKey,
self.country_config, self.mock_page)
+ self.assertEqual(result, True)
--
To view, visit https://gerrit.wikimedia.org/r/287198
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f48c744ee7ce5d57ddce7f12e18d5ada41c75ce
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil <[email protected]>
Gerrit-Reviewer: Jean-Frédéric <[email protected]>
Gerrit-Reviewer: Lokal Profil <[email protected]>
Gerrit-Reviewer: Multichill <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
