diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1bc3e407..d90d0242 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: python -m pip install --upgrade pip wheel pip install -r requirements_dev.txt - name: Run tests - run: nosetests iati_datastore --with-coverage --cover-package iati_datastore/iatilib + run: coverage run -m pytest - name: Coveralls run: coveralls env: diff --git a/.gitignore b/.gitignore index d4cb36bd..112cba48 100644 --- a/.gitignore +++ b/.gitignore @@ -48,7 +48,6 @@ htmlcov/ .coverage .coverage.* .cache -nosetests.xml coverage.xml *.cover *.py,cover diff --git a/README.md b/README.md index 3f329f19..bbc9e9cb 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ git clone https://github.com/codeforIATI/iati-datastore.git pip install -r requirements_dev.txt # Run the tests (these tests use an in-memory sqlite db) -nosetests iati_datastore +pytest # Create a new PostgreSQL database sudo -u postgres psql -c "CREATE DATABASE iati_datastore" @@ -88,7 +88,7 @@ A Vagrant box is also provided. `vagrant up` as normal, then `vagrant ssh`. ``` # Run the tests (these tests use an in-memory sqlite db) -nosetests iati_datastore +pytest # Create the db tables iati db upgrade diff --git a/iati_datastore/iatilib/parse.py b/iati_datastore/iatilib/parse.py index 16550889..9a67bd3e 100644 --- a/iati_datastore/iatilib/parse.py +++ b/iati_datastore/iatilib/parse.py @@ -130,7 +130,7 @@ def reporting_org(element, resource=no_resource, major_version='1'): except (MissingValue, ValueError) as exe: data['type'] = None iati_identifier = xval(xml, "/iati-identifier/text()", 'no_identifier') - log.warn( + log.warning( _(u"Failed to import a valid reporting-org.type in activity {0}, error was: {1}".format( iati_identifier, exe), logger='activity_importer', dataset=resource.dataset_id, resource=resource.url), @@ -152,7 +152,7 @@ def participating_orgs(xml, resource=None, major_version='1'): ret.append(Participation(role=role, organisation=organisation)) except ValueError as e: iati_identifier = xval(xml, "/iati-activity/iati-identifier/text()", 'no_identifier') - log.warn( + log.warning( _(u"Failed to import a valid sector percentage:{0} in activity {1}, error was: {2}".format( 'organisation_role', iati_identifier, e), logger='activity_importer', dataset=resource.dataset_id, resource=resource.url), @@ -253,7 +253,7 @@ def process(ele): except (MissingValue, InvalidDateError, ValueError, InvalidOperation) as exe: data[field] = None iati_identifier = xval(xml, "/iati-activity/iati-identifier/text()", 'no_identifier') - log.warn( + log.warning( _(u"Failed to import a valid {0} in activity {1}, error was: {2}".format( field, iati_identifier, exe), logger='activity_importer', dataset=resource.dataset_id, resource=resource.url), @@ -268,7 +268,7 @@ def process(ele): ret.append(process(ele)) except MissingValue as exe: iati_identifier = xval(xml, "/iati-identifier/text()", 'no_identifier') - log.warn( + log.warning( _(u"Failed to import a valid transaction in activity {0}, error was: {1}".format( iati_identifier, exe), logger='activity_importer', dataset=resource.dataset_id, resource=resource.url), @@ -292,7 +292,7 @@ def sector_percentages(xml, resource=no_resource, major_version='1'): setattr(sp, field, function(ele, resource)) except (MissingValue, ValueError) as exe: iati_identifier = xval(xml, "/iati-activity/iati-identifier/text()", 'no_identifier') - log.warn( + log.warning( _("uFailed to import a valid {0} in activity {1}, error was: {2}".format( field, iati_identifier, exe), logger='activity_importer', dataset=resource.dataset_id, resource=resource.url), @@ -338,7 +338,7 @@ def process(ele): except (MissingValue, InvalidDateError, ValueError, InvalidOperation) as exe: data[field] = None iati_identifier = xval(xml, "/iati-activity/iati-identifier/text()", 'no_identifier') - log.warn( + log.warning( _("uFailed to import a valid budget:{0} in activity {1}, error was: {2}".format( field, iati_identifier, exe), logger='activity_importer', dataset=resource.dataset_id, resource=resource.url), @@ -372,7 +372,7 @@ def related_activities(xml, resource=no_resource, major_version='1'): results.append(RelatedActivity(ref=ref, text=text)) except MissingValue as e: iati_identifier = xval(xml, "/iati-activity/iati-identifier/text()", 'no_identifier') - log.warn( + log.warning( _(u"Failed to import a valid related-activity in activity {0}, error was: {1}".format( iati_identifier, e), logger='activity_importer', dataset=resource.dataset_id, resource=resource.url), @@ -410,7 +410,7 @@ def from_codelist(codelist, path, xml, resource=no_resource): xml, "/iati-activity/iati-identifier/text()", 'no_identifier') - log.warn( + log.warning( _((u"Failed to import a valid {0} in activity" "{1}, error was: {2}".format(codelist, iati_identifier, e)), logger='activity_importer', @@ -496,7 +496,7 @@ def activity(xml, resource=no_resource, major_version='1', version=None): data[field] = [] else: data[field] = None - log.warn( + log.warning( _(u"Failed to import a valid {0} in activity {1}, error was: {2}".format( field, data['iati_identifier'], exe), logger='activity_importer', dataset=resource.dataset_id, resource=resource.url), diff --git a/iati_datastore/iatilib/test/test_api.py b/iati_datastore/iatilib/test/test_api.py index 93f89459..1a094b42 100644 --- a/iati_datastore/iatilib/test/test_api.py +++ b/iati_datastore/iatilib/test/test_api.py @@ -15,15 +15,15 @@ class TestLatestApiRedirect(ClientTestCase): def test_latest_api_redirect(self): resp = self.client.get('/api/') - self.assertEquals(302, resp.status_code) + self.assertEqual(302, resp.status_code) self.assertRegex(resp.headers['Location'], '/api/1/$') class TestListRoutes(ClientTestCase): def test_list_routes(self): resp = self.client.get('/api/1/') - self.assertEquals(200, resp.status_code) - self.assertEquals("application/json", resp.content_type) + self.assertEqual(200, resp.status_code) + self.assertEqual("application/json", resp.content_type) data = json.loads(resp.data) self.assertIn('http://localhost/api/1/', data) @@ -31,7 +31,7 @@ def test_list_routes(self): class TestAbout(ClientTestCase): def test_about_http(self): resp = self.client.get('/api/1/about/') - self.assertEquals(200, resp.status_code) + self.assertEqual(200, resp.status_code) class TestAboutDatasets(ClientTestCase): @@ -44,9 +44,9 @@ def test_about(self): ) resp = self.client.get('/api/1/about/dataset/') data = json.loads(resp.data) - self.assertEquals(200, resp.status_code) + self.assertEqual(200, resp.status_code) self.assertIn("datasets", data) - self.assertEquals("tst-old", data["datasets"][0]) + self.assertEqual("tst-old", data["datasets"][0]) def test_about_details(self): fac.DatasetFactory.create( @@ -57,9 +57,9 @@ def test_about_details(self): ) resp = self.client.get('/api/1/about/dataset/?detail=true') data = json.loads(resp.data) - self.assertEquals(200, resp.status_code) + self.assertEqual(200, resp.status_code) self.assertIn("datasets", data) - self.assertEquals('http://foo', data["datasets"][0]['url']) + self.assertEqual('http://foo', data["datasets"][0]['url']) self.assertIn("ok", data) self.assertIn("total-count", data) @@ -72,18 +72,18 @@ def test_about_dataset(self): ) resp = self.client.get('/api/1/about/dataset/tst-old/') data = json.loads(resp.data) - self.assertEquals(200, resp.status_code) - self.assertEquals('tst-old', data["dataset"]) - self.assertEquals(1, data["num_resources"]) - self.assertEquals('http://foo', data["resources"][0]['url']) + self.assertEqual(200, resp.status_code) + self.assertEqual('tst-old', data["dataset"]) + self.assertEqual(1, data["num_resources"]) + self.assertEqual('http://foo', data["resources"][0]['url']) def test_about_not_a_dataset(self): resp = self.client.get('/api/1/about/dataset/bad-dataset-id/') - self.assertEquals(404, resp.status_code) + self.assertEqual(404, resp.status_code) def test_about_invalid_filter(self): resp = self.client.get('/api/1/about/dataset/?invalid=true') - self.assertEquals(400, resp.status_code) + self.assertEqual(400, resp.status_code) self.assertIn( "Invalid arguments passed as filter", resp.data.decode()) @@ -94,36 +94,36 @@ def test_errors(self): fac.LogFactory.create() resp = self.client.get('/api/1/error/dataset/') data = json.loads(resp.data) - self.assertEquals(200, resp.status_code) + self.assertEqual(200, resp.status_code) self.assertIn("errored_datasets", data) - self.assertEquals( + self.assertEqual( 'bad-dataset', data['errored_datasets'][0]['dataset']) def test_errors_log(self): fac.LogFactory.create() resp = self.client.get('/api/1/error/dataset.log') - self.assertEquals(200, resp.status_code) - self.assertEquals( + self.assertEqual(200, resp.status_code) + self.assertEqual( "text/plain; charset=utf-8", resp.content_type) def test_error_log(self): fac.LogFactory.create() resp = self.client.get('/api/1/error/dataset.log/bad-dataset/') - self.assertEquals(200, resp.status_code) - self.assertEquals( + self.assertEqual(200, resp.status_code) + self.assertEqual( "text/plain; charset=utf-8", resp.content_type) def test_error(self): fac.LogFactory.create() resp = self.client.get('/api/1/error/dataset/bad-dataset/') data = json.loads(resp.data) - self.assertEquals(200, resp.status_code) + self.assertEqual(200, resp.status_code) self.assertIn("errors", data) - self.assertEquals( + self.assertEqual( 'bad-dataset', data['errors'][0]['dataset']) - self.assertEquals( + self.assertEqual( 'Dataset is broken', data['errors'][0]['msg']) @@ -138,12 +138,12 @@ def test_deleted_activities(self): resp = self.client.get('api/1/about/deleted/') data = json.loads(resp.data) deleted_activities = data['deleted_activities'] - self.assertEquals("test", deleted_activities[0]['iati_identifier']) - self.assertEquals("2000-01-01", deleted_activities[0]['deletion_date']) + self.assertEqual("test", deleted_activities[0]['iati_identifier']) + self.assertEqual("2000-01-01", deleted_activities[0]['deletion_date']) def test_deleted_invalid_filter(self): resp = self.client.get('/api/1/about/deleted/?invalid=true') - self.assertEquals(400, resp.status_code) + self.assertEqual(400, resp.status_code) self.assertIn( "Invalid arguments passed as filter", resp.data.decode()) @@ -152,8 +152,8 @@ def test_deleted_invalid_filter(self): class TestMetaFilters(ClientTestCase): def test_http(self): resp = self.client.get('/api/1/meta/filters/') - self.assertEquals(200, resp.status_code) - self.assertEquals("application/json", resp.content_type) + self.assertEqual(200, resp.status_code) + self.assertEqual("application/json", resp.content_type) self.assertIn("filters", json.loads(resp.data)) @@ -162,15 +162,15 @@ class TestEmptyDb_JSON(ClientTestCase): def test_http_ok(self): resp = self.client.get(self.url) - self.assertEquals(200, resp.status_code) + self.assertEqual(200, resp.status_code) def test_content_type(self): resp = self.client.get(self.url) - self.assertEquals("application/json", resp.content_type) + self.assertEqual("application/json", resp.content_type) def tests_json_decode(self): resp = self.client.get(self.url) - self.assert_(json.loads(resp.data)) + self.assertTrue(json.loads(resp.data)) def test_json_ok(self): resp = self.client.get(self.url) @@ -180,7 +180,7 @@ def test_json_ok(self): def test_json_results(self): resp = self.client.get(self.url) js = json.loads(resp.data) - self.assertEquals(js["iati-activities"], []) + self.assertEqual(js["iati-activities"], []) class TestEmptyDb_XML(ClientTestCase): @@ -199,16 +199,16 @@ class TestEmptyDb_XML(ClientTestCase): def test_http_ok(self): resp = self.client.get(self.url) - self.assertEquals(200, resp.status_code) + self.assertEqual(200, resp.status_code) def test_content_type(self): resp = self.client.get(self.url) - self.assertEquals("application/xml; charset=utf-8", resp.content_type) + self.assertEqual("application/xml; charset=utf-8", resp.content_type) def test_decode(self): resp = self.client.get(self.url) # an ElementTree node object does not test as true - self.assert_(hasattr(ET.fromstring(resp.get_data(as_text=True)), "tag")) + self.assertTrue(hasattr(ET.fromstring(resp.get_data(as_text=True)), "tag")) def test_resp_ok(self): resp = self.client.get(self.url) @@ -218,12 +218,12 @@ def test_resp_ok(self): def test_results(self): resp = self.client.get(self.url) xml = ET.fromstring(resp.get_data(as_text=True)) - self.assertEquals(xml.findall('result-activities'), []) + self.assertEqual(xml.findall('result-activities'), []) def test_root_element(self): resp = self.client.get(self.url) xml = ET.fromstring(resp.get_data(as_text=True)) - self.assertEquals(xml.tag, "result") + self.assertEqual(xml.tag, "result") class TestEmptyDb_ActivityCSV(ClientTestCase): @@ -234,11 +234,11 @@ class TestEmptyDb_ActivityCSV(ClientTestCase): def test_http_ok(self): resp = self.client.get(self.url) - self.assertEquals(200, resp.status_code) + self.assertEqual(200, resp.status_code) def test_content_type(self): resp = self.client.get(self.url) - self.assertEquals("text/csv; charset=utf-8", resp.content_type) + self.assertEqual("text/csv; charset=utf-8", resp.content_type) def test_fields(self): resp = self.client.get(self.url) @@ -255,11 +255,11 @@ class TestEmptyDb_TransactionCSV(ClientTestCase): def test_http_ok(self): resp = self.client.get(self.url) - self.assertEquals(200, resp.status_code) + self.assertEqual(200, resp.status_code) def test_content_type(self): resp = self.client.get(self.url) - self.assertEquals("text/csv; charset=utf-8", resp.content_type) + self.assertEqual("text/csv; charset=utf-8", resp.content_type) class TestEmptyDb_BudgetCSV(ClientTestCase): @@ -270,11 +270,11 @@ class TestEmptyDb_BudgetCSV(ClientTestCase): def test_http_ok(self): resp = self.client.get(self.url) - self.assertEquals(200, resp.status_code) + self.assertEqual(200, resp.status_code) def test_content_type(self): resp = self.client.get(self.url) - self.assertEquals("text/csv; charset=utf-8", resp.content_type) + self.assertEqual("text/csv; charset=utf-8", resp.content_type) def fixture_filename(fix_name): @@ -297,7 +297,7 @@ def test_xml_activity_count(self): load_fix("single_activity.xml") resp = self.client.get('/api/1/access/activity.xml') xml = ET.fromstring(resp.get_data(as_text=True)) - self.assertEquals(1, len(xml.findall('.//iati-activity'))) + self.assertEqual(1, len(xml.findall('.//iati-activity'))) def test_xml_activity_data(self): load_fix("single_activity.xml") @@ -306,13 +306,13 @@ def test_xml_activity_data(self): xml = ET.fromstring(resp.get_data(as_text=True)) x1 = in_xml.find('.//iati-activity') x2 = xml.find('.//iati-activity') - self.assertEquals(x1, x2) + self.assertEqual(x1, x2) def test_csv_activity_count(self): load_fix("single_activity.xml") with self.client as client: resp = client.get('/api/1/access/activity.csv') - self.assertEquals(2, resp.get_data(as_text=True).count("\n")) + self.assertEqual(2, resp.get_data(as_text=True).count("\n")) class TestManyActivities(ClientTestCase): @@ -320,14 +320,14 @@ def test_xml_activity_count(self): load_fix("many_activities.xml") resp = self.client.get('/api/1/access/activity.xml') xml = ET.fromstring(resp.get_data(as_text=True)) - self.assertEquals(2, len(xml.findall('.//iati-activity'))) + self.assertEqual(2, len(xml.findall('.//iati-activity'))) def test_xml_activity_data(self): load_fix("many_activities.xml") in_xml = ET.parse(fixture_filename("many_activities.xml")) resp = self.client.get('/api/1/access/activity.xml') xml = ET.fromstring(resp.get_data(as_text=True)) - self.assertEquals( + self.assertEqual( ET.tostring(in_xml.find('.//iati-activity')), ET.tostring(xml.find('.//iati-activity'))) @@ -336,44 +336,44 @@ def test_csv_activity_count(self): with self.client as client: resp = client.get('/api/1/access/activity.csv') reader = csv.DictReader(StringIO(resp.get_data(as_text=True))) - self.assertEquals(2, len(list(reader))) + self.assertEqual(2, len(list(reader))) class TestPagination(ClientTestCase): def test_invalid_page(self): resp = self.client.get('/api/1/access/activity/?offset=-1') - self.assertEquals(400, resp.status_code) + self.assertEqual(400, resp.status_code) class ApiViewMixin(object): @mock.patch('iatilib.frontend.api1.validators.activity_api_args') def test_validator_called(self, mock): self.client.get(self.base_url) - self.assertEquals(1, mock.call_count) + self.assertEqual(1, mock.call_count) def test_filter_called(self): with mock.patch(self.filter) as mm: self.client.get(self.base_url + '?recipient-country=MW') - self.assertEquals(1, mm.call_count) + self.assertEqual(1, mm.call_count) def test_serializer_called(self): with mock.patch(self.serializer) as mm: self.client.get(self.base_url) - self.assertEquals(1, mm.call_count) + self.assertEqual(1, mm.call_count) def test_invalid_format(self): resp = self.client.get(self.base_url + ".zzz") - self.assertEquals(404, resp.status_code) + self.assertEqual(404, resp.status_code) def test_junk_before_format(self): url = self.base_url[:-4] + '-bad.csv' resp = self.client.get(url) - self.assertEquals(404, resp.status_code) + self.assertEqual(404, resp.status_code) def test_junk_in_format(self): url = self.base_url[:-4] + '.bad-csv' resp = self.client.get(url) - self.assertEquals(404, resp.status_code) + self.assertEqual(404, resp.status_code) class TestActivityView(ClientTestCase, ApiViewMixin): @@ -400,57 +400,57 @@ def test_reporting_org(self): output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('reporting-org-ref') - self.assertEquals(u'GB-CHC-285776', output[1][i]) + self.assertEqual(u'GB-CHC-285776', output[1][i]) def test_ref_output(self): load_fix("transaction_ref.xml") output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('transaction_ref') - self.assertEquals(u'36258', output[1][i]) - self.assertEquals(u'', output[2][i]) + self.assertEqual(u'36258', output[1][i]) + self.assertEqual(u'', output[2][i]) def test_transaction_value_currency(self): load_fix("transaction_provider.xml") output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('transaction_value_currency') - self.assertEquals(u'GBP', output[1][i]) + self.assertEqual(u'GBP', output[1][i]) def test_transaction_value_value_date(self): load_fix("transaction_provider.xml") output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('transaction_value_value-date') - self.assertEquals(u'2011-08-19', output[1][i]) + self.assertEqual(u'2011-08-19', output[1][i]) def test_provider_org_ref_output(self): load_fix("transaction_provider.xml") output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('transaction_provider-org_ref') - self.assertEquals(u'GB-1-201242-101', output[1][i]) + self.assertEqual(u'GB-1-201242-101', output[1][i]) def test_provider_org_output(self): load_fix("transaction_provider.xml") output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('transaction_provider-org') - self.assertEquals(u'DFID', output[1][i]) + self.assertEqual(u'DFID', output[1][i]) def test_provider_org_activity_id_output(self): load_fix("provider-activity-id.xml") output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('transaction_provider-org_provider-activity-id') - self.assertEquals(u'GB-1-202907', output[1][i]) + self.assertEqual(u'GB-1-202907', output[1][i]) def test_receiver_org_ref_output(self): load_fix("transaction_provider.xml") output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('transaction_receiver-org_ref') - self.assertEquals(u'GB-CHC-313139', output[1][i]) + self.assertEqual(u'GB-CHC-313139', output[1][i]) def test_receiver_org_output(self): """receiver_org should be in transaction.csv output""" @@ -458,21 +458,21 @@ def test_receiver_org_output(self): output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('transaction_receiver-org') - self.assertEquals(u'Bond', output[1][i]) + self.assertEqual(u'Bond', output[1][i]) def test_receiver_org_activity_id_output(self): load_fix("provider-activity-id.xml") output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('transaction_receiver-org_receiver-activity-id') - self.assertEquals(u'GB-CHC-1068839-dfid_ag_11-13', output[1][i]) + self.assertEqual(u'GB-CHC-1068839-dfid_ag_11-13', output[1][i]) def test_description(self): load_fix("transaction_provider.xml") output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('transaction_description') - self.assertEquals( + self.assertEqual( u'Funds received from DFID for activities in Aug- Sept 2011', output[1][i] ) @@ -482,35 +482,35 @@ def test_flow_type(self): output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('transaction_flow-type_code') - self.assertEquals(u'30', output[1][i]) + self.assertEqual(u'30', output[1][i]) def test_finance_type(self): load_fix("transaction_fields_code_lists.xml") output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('transaction_finance-type_code') - self.assertEquals(u'110', output[1][i]) + self.assertEqual(u'110', output[1][i]) def test_aid_type(self): load_fix("transaction_fields_code_lists.xml") output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('transaction_aid-type_code') - self.assertEquals(u'B01', output[1][i]) + self.assertEqual(u'B01', output[1][i]) def test_tied_status(self): load_fix("transaction_fields_code_lists.xml") output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('transaction_tied-status_code') - self.assertEquals(u'5', output[1][i]) + self.assertEqual(u'5', output[1][i]) def test_disbursement_channel_status(self): load_fix("transaction_fields_code_lists.xml") output = list(csv.reader(StringIO(self.client.get(self.base_url).get_data(as_text=True)))) csv_headers = output[0] i = csv_headers.index('transaction_disbursement-channel_code') - self.assertEquals(u'2', output[1][i]) + self.assertEqual(u'2', output[1][i]) class TestTransactionView(ClientTestCase, ApiViewMixin, CommonTransactionTests): diff --git a/iati_datastore/iatilib/test/test_builder.py b/iati_datastore/iatilib/test/test_builder.py index 2c1bb26c..2d4e3626 100644 --- a/iati_datastore/iatilib/test/test_builder.py +++ b/iati_datastore/iatilib/test/test_builder.py @@ -5,24 +5,24 @@ class TestLatestApiRedirect(ClientTestCase): def test_builder_errors(self): resp = self.client.get( '/build/api/1/access/nonsense/') - self.assertEquals(404, resp.status_code) + self.assertEqual(404, resp.status_code) resp = self.client.get( '/build/api/1/access/activity/nonsense.xml') - self.assertEquals(404, resp.status_code) + self.assertEqual(404, resp.status_code) resp = self.client.get( '/build/api/1/access/activity/by_country.nonsense') - self.assertEquals(404, resp.status_code) + self.assertEqual(404, resp.status_code) def test_builder_activity_xml(self): url_from = '/build/api/1/access/activity.xml' url_to = '/' resp = self.client.get(url_from) - self.assertEquals(302, resp.status_code) + self.assertEqual(302, resp.status_code) self.assertTrue(resp.headers['Location'].endswith(url_to)) def test_builder_transaction_by_country_csv(self): url_from = '/build/api/1/access/transaction/by_country.csv' url_to = '/?breakdown=transaction&grouping=%2Fby_country&format=csv' resp = self.client.get(url_from) - self.assertEquals(302, resp.status_code) + self.assertEqual(302, resp.status_code) self.assertTrue(resp.headers['Location'].endswith(url_to)) diff --git a/iati_datastore/iatilib/test/test_console.py b/iati_datastore/iatilib/test/test_console.py index 2e8d65b4..b965cf67 100644 --- a/iati_datastore/iatilib/test/test_console.py +++ b/iati_datastore/iatilib/test/test_console.py @@ -14,17 +14,17 @@ def setUp(self): def test_build_docs(self, mock): command = 'make dirhtml' result = self.runner.invoke(console.build_docs) - self.assertEquals(0, result.exit_code) - self.assertEquals(1, mock.call_count) - self.assertEquals(mock.call_args.args[0], command.split(' ')) + self.assertEqual(0, result.exit_code) + self.assertEqual(1, mock.call_count) + self.assertEqual(mock.call_args.args[0], command.split(' ')) @mock.patch('subprocess.run') def test_build_query_builder(self, mock): install_command = 'npm i' build_command = 'npm run generate' result = self.runner.invoke(console.build_query_builder) - self.assertEquals(0, result.exit_code) - self.assertEquals(2, mock.call_count) + self.assertEqual(0, result.exit_code) + self.assertEqual(2, mock.call_count) args = [' '.join(arg_list.args[0]) for arg_list in mock.call_args_list] self.assertIn(install_command, args) @@ -33,33 +33,33 @@ def test_build_query_builder(self, mock): def test_cleanup(self): fac.LogFactory.create(logger='crawler') fac.LogFactory.create(logger='failed_activity') - self.assertEquals(2, len(Log.query.all())) + self.assertEqual(2, len(Log.query.all())) result = self.runner.invoke(console.cleanup) - self.assertEquals(0, result.exit_code) - self.assertEquals(1, len(Log.query.all())) + self.assertEqual(0, result.exit_code) + self.assertEqual(1, len(Log.query.all())) @mock.patch('click.confirm') @mock.patch('iatilib.db.drop_all') def test_drop_db(self, prompt_mock, drop_all_mock): result = self.runner.invoke(console.drop_database) - self.assertEquals(0, result.exit_code) - self.assertEquals(1, prompt_mock.call_count) - self.assertEquals(1, drop_all_mock.call_count) + self.assertEqual(0, result.exit_code) + self.assertEqual(1, prompt_mock.call_count) + self.assertEqual(1, drop_all_mock.call_count) @mock.patch('iatilib.rq.get_queue') def test_status_cmd(self, rq_mock): result = self.runner.invoke(crawler.status_cmd) - self.assertEquals(0, result.exit_code) - self.assertEquals(1, rq_mock.call_count) + self.assertEqual(0, result.exit_code) + self.assertEqual(1, rq_mock.call_count) @mock.patch('iatikit.download') def test_download_cmd(self, iatikit_mock): result = self.runner.invoke(crawler.download_cmd) - self.assertEquals(0, result.exit_code) - self.assertEquals(1, iatikit_mock.data.call_count) + self.assertEqual(0, result.exit_code) + self.assertEqual(1, iatikit_mock.data.call_count) @mock.patch('iatilib.crawler.fetch_dataset_list') def test_fetch_dataset_list_cmd(self, fetch_dataset_list_mock): result = self.runner.invoke(crawler.fetch_dataset_list_cmd) - self.assertEquals(0, result.exit_code) - self.assertEquals(1, fetch_dataset_list_mock.call_count) + self.assertEqual(0, result.exit_code) + self.assertEqual(1, fetch_dataset_list_mock.call_count) diff --git a/iati_datastore/iatilib/test/test_crawler.py b/iati_datastore/iatilib/test/test_crawler.py index 36b44812..98816ef8 100644 --- a/iati_datastore/iatilib/test/test_crawler.py +++ b/iati_datastore/iatilib/test/test_crawler.py @@ -34,12 +34,12 @@ def test_update_adds_datasets(self, iatikit_mock): data_mock.last_updated = datetime.datetime.utcnow() data_mock.datasets = [iatikit.Dataset('tst-a')] datasets = crawler.fetch_dataset_list() - self.assertEquals(1, datasets.count()) + self.assertEqual(1, datasets.count()) data_mock.datasets = [ iatikit.Dataset('tst-a.xml'), iatikit.Dataset('tst-b.xml')] datasets = crawler.fetch_dataset_list() - self.assertEquals(2, datasets.count()) + self.assertEqual(2, datasets.count()) @mock.patch('iatikit.data') def test_update_deletes_datasets(self, iatikit_mock): @@ -49,20 +49,20 @@ def test_update_deletes_datasets(self, iatikit_mock): iatikit.Dataset("tst-a.xml"), iatikit.Dataset("tst-b.xml")] datasets = crawler.fetch_dataset_list() - self.assertEquals(2, datasets.count()) + self.assertEqual(2, datasets.count()) data_mock.datasets = [ iatikit.Dataset("tst-a.xml")] datasets = crawler.fetch_dataset_list() - self.assertEquals(1, datasets.count()) + self.assertEqual(1, datasets.count()) @mock.patch('iatikit.data') def test_fetch_dataset(self, iatikit_mock): iatikit_mock.return_value = registry dataset = crawler.fetch_dataset_metadata( Dataset(name="old-org-acts")) - self.assertEquals(1, len(dataset.resources)) - self.assertEquals("https://old-org.nl/sites/default/files/IATI/activities.xml", dataset.resources[0].url) - self.assertEquals("old-org", dataset.publisher) + self.assertEqual(1, len(dataset.resources)) + self.assertEqual("https://old-org.nl/sites/default/files/IATI/activities.xml", dataset.resources[0].url) + self.assertEqual("old-org", dataset.publisher) @mock.patch('iatikit.data') def test_fetch_dataset_count_commited_resources(self, iatikit_mock): @@ -70,7 +70,7 @@ def test_fetch_dataset_count_commited_resources(self, iatikit_mock): crawler.fetch_dataset_metadata( Dataset(name="old-org-acts")) db.session.commit() - self.assertEquals(1, Resource.query.count()) + self.assertEqual(1, Resource.query.count()) @mock.patch('iatikit.data') def test_update_dataset_same_url(self, iatikit_mock): @@ -89,7 +89,7 @@ def test_update_dataset_same_url(self, iatikit_mock): crawler.update_dataset( dataset_name='old-org-acts', ignore_hashes=False) # resource was not added - self.assertEquals(0, len(dataset_new.resources)) + self.assertEqual(0, len(dataset_new.resources)) log = Log.query.filter_by(dataset="old-org-acts").first() self.assertIn('Failed to update dataset old-org-acts', log.msg) @@ -103,9 +103,9 @@ def test_fetch_resource_succ(self, iatikit_mock): )] ) resource = crawler.fetch_resource(dataset=dataset, ignore_hashes=False) - self.assertEquals(b"", url="http://foo") resource = crawler.parse_resource(resource) - self.assertEquals([], list(resource.activities)) - self.assertEquals(None, resource.last_parse_error) + self.assertEqual([], list(resource.activities)) + self.assertEqual(None, resource.last_parse_error) now = datetime.datetime.utcnow() - self.assertAlmostEquals( + self.assertAlmostEqual( resource.last_parsed, now, delta=datetime.timedelta(seconds=15)) @@ -175,7 +175,7 @@ def test_parse_resource_succ_replaces_activities(self): resource.document = b"" resource = crawler.parse_resource(resource) db.session.commit() - self.assertEquals(None, Activity.query.get(act.iati_identifier)) + self.assertEqual(None, Activity.query.get(act.iati_identifier)) self.assertIn( "deleted_activity", [da.iati_identifier for da in DeletedActivity.query.all()] @@ -236,7 +236,7 @@ def test_last_changed_datetime(self): db.session.commit() crawler.parse_resource(resource) acts = db.session.query(Activity).all() - self.assertEquals( + self.assertEqual( datetime.datetime(2000, 1, 1), acts[0].last_change_datetime) @@ -244,7 +244,7 @@ def test_parse_resource_fail(self): resource = Resource(document=b"", url="") with self.assertRaises(parse.ParserError): resource = crawler.parse_resource(resource) - self.assertEquals(None, resource.last_parsed) + self.assertEqual(None, resource.last_parsed) @mock.patch('iatikit.data') def test_deleted_activities(self, iatikit_mock): @@ -276,7 +276,7 @@ def test_document_metadata(self): ) result = crawler.parse_resource(res) - self.assertEquals("1.00", result.version) + self.assertEqual("1.00", result.version) class TestResourceUpdate(AppTestCase): @@ -313,7 +313,7 @@ def test_activity_in_two_resources(self): ) crawler.update_activities("tst-b") - self.assertEquals( + self.assertEqual( u"orig", Activity.query.get(u"47045-ARM-202-G05-H-00").title ) diff --git a/iati_datastore/iatilib/test/test_docs.py b/iati_datastore/iatilib/test/test_docs.py index 97be93c5..e06c88db 100644 --- a/iati_datastore/iatilib/test/test_docs.py +++ b/iati_datastore/iatilib/test/test_docs.py @@ -13,7 +13,7 @@ def setUp(self): def test_docs(self): resp = self.client.get('/docs/') - self.assertEquals(200, resp.status_code) + self.assertEqual(200, resp.status_code) self.assertIn( "What is IATI Datastore?", resp.data.decode()) @@ -22,12 +22,12 @@ def test_docs(self): class TestDocsRedirects(ClientTestCase): def test_error_api_redirect(self): resp = self.client.get('/error/') - self.assertEquals(302, resp.status_code) + self.assertEqual(302, resp.status_code) self.assertRegex(resp.headers['Location'], '/docs/api/error/$') class TestFavicon(ClientTestCase): def test_favicon(self): resp = self.client.get('/favicon.ico') - self.assertEquals(200, resp.status_code) + self.assertEqual(200, resp.status_code) self.assertRegex(resp.content_type, "^image/") diff --git a/iati_datastore/iatilib/test/test_filter.py b/iati_datastore/iatilib/test/test_filter.py index 8f18a625..bc493094 100644 --- a/iati_datastore/iatilib/test/test_filter.py +++ b/iati_datastore/iatilib/test/test_filter.py @@ -277,7 +277,7 @@ def test_by_recipient_region_code_not_in_list(self): activities = dsfilter.activities({ "recipient-region": cl.Region.from_string(u"xxx") }) - self.assertEquals([], activities.all()) + self.assertEqual([], activities.all()) self.assertNotIn(act_not, activities.all()) def test_or_filter(self): diff --git a/iati_datastore/iatilib/test/test_model.py b/iati_datastore/iatilib/test/test_model.py index 5e5b7764..5c659097 100644 --- a/iati_datastore/iatilib/test/test_model.py +++ b/iati_datastore/iatilib/test/test_model.py @@ -28,8 +28,8 @@ def test_replace_activities(self): ) ] db.session.commit() - self.assertEquals(res.activities[0].title, u"t2") - self.assertEquals( + self.assertEqual(res.activities[0].title, u"t2") + self.assertEqual( Resource.query.get(res.url).activities[0].title, u"t2") def test_replace_activity_w_many_dependant_rows(self): @@ -57,7 +57,7 @@ def test_replace_activity_w_many_dependant_rows(self): )] ) Activity.query.filter_by(resource_url=res.url).delete() - self.assertEquals( + self.assertEqual( 0, Activity.query.filter_by(resource_url=res.url).count() ) @@ -67,16 +67,16 @@ def test_replace_activity_w_many_dependant_rows(self): class TestOrganisation(AppTestCase): def test_organisation_repr(self): org = fac.OrganisationFactory.build(ref='org ref') - self.assertEquals(str(org), "Organisation(ref='org ref')") + self.assertEqual(str(org), "Organisation(ref='org ref')") class TestTransaction(AppTestCase): def test_transaction_repr(self): org = fac.TransactionFactory.build(id='test-trans-0') - self.assertEquals(str(org), "Transaction(id='test-trans-0')") + self.assertEqual(str(org), "Transaction(id='test-trans-0')") class TestLog(AppTestCase): def test_log_repr(self): org = fac.LogFactory.build(msg='hello') - self.assertEquals(str(org), "") + self.assertEqual(str(org), "") diff --git a/iati_datastore/iatilib/test/test_parser.py b/iati_datastore/iatilib/test/test_parser.py index ee141f64..0411c2bb 100644 --- a/iati_datastore/iatilib/test/test_parser.py +++ b/iati_datastore/iatilib/test/test_parser.py @@ -26,115 +26,115 @@ def setUp(self): self.act = self.activities[0] def test_id(self): - self.assertEquals( + self.assertEqual( u"AA-AAA-123456789-ABC123", self.act.iati_identifier) def test_title(self): - self.assertEquals( + self.assertEqual( u"Activity title", self.act.title) def test_last_updated_time(self): - self.assertEquals(datetime.date(2014, 9, 10), self.act.last_updated_datetime) + self.assertEqual(datetime.date(2014, 9, 10), self.act.last_updated_datetime) def test_description(self): - self.assert_(self.act.description.startswith( + self.assertTrue(self.act.description.startswith( u"General activity description text.")) def test_reporting_org_ref(self): - self.assertEquals(u"AA-AAA-123456789", self.act.reporting_org.ref) + self.assertEqual(u"AA-AAA-123456789", self.act.reporting_org.ref) def test_reporting_org_type(self): - self.assertEquals( + self.assertEqual( cl2.OrganisationType.multilateral, self.act.reporting_org.type ) def test_reporting_org_name(self): - self.assertEquals( + self.assertEqual( self.act.reporting_org.name, u"Organisation name" ) def test_default_currency(self): - self.assertEquals( + self.assertEqual( cl2.Currency.us_dollar, self.act.default_currency ) def test_participating_org(self): - self.assertEquals( + self.assertEqual( cl2.OrganisationRole.funding, self.act.participating_orgs[0].role) - self.assertEquals( + self.assertEqual( cl2.OrganisationType.multilateral, self.act.participating_orgs[0].organisation.type) - self.assertEquals( + self.assertEqual( cl2.OrganisationType.multilateral, self.act.participating_orgs[0].organisation.type) - self.assertEquals( + self.assertEqual( u"BB-BBB-123456789", self.act.participating_orgs[0].organisation.ref) - self.assertEquals( + self.assertEqual( u"Name of Agency B", self.act.participating_orgs[0].organisation.name) - self.assertEquals( + self.assertEqual( cl2.OrganisationRole.accountable, self.act.participating_orgs[1].role) - self.assertEquals( + self.assertEqual( cl2.OrganisationType.government, self.act.participating_orgs[1].organisation.type) - self.assertEquals( + self.assertEqual( u"CC-CCC-123456789", self.act.participating_orgs[1].organisation.ref) - self.assertEquals( + self.assertEqual( u"Name of Agency C", self.act.participating_orgs[1].organisation.name) - self.assertEquals( + self.assertEqual( cl2.OrganisationRole.extending, self.act.participating_orgs[2].role) - self.assertEquals( + self.assertEqual( cl2.OrganisationType.international_ngo, self.act.participating_orgs[2].organisation.type) - self.assertEquals( + self.assertEqual( u"AA-AAA-123456789", self.act.participating_orgs[2].organisation.ref) - self.assertEquals( + self.assertEqual( u"Name of Agency A", self.act.participating_orgs[2].organisation.name) def test_recipient_country_percentages(self): act = self.act - self.assertEquals(2, len(self.act.recipient_country_percentages)) - self.assertEquals( + self.assertEqual(2, len(self.act.recipient_country_percentages)) + self.assertEqual( cl2.Country.afghanistan, act.recipient_country_percentages[0].country) - self.assertEquals( + self.assertEqual( cl2.Country.antigua_and_barbuda, act.recipient_country_percentages[1].country) - self.assertEquals( + self.assertEqual( 25, act.recipient_country_percentages[0].percentage) - self.assertEquals( + self.assertEqual( 25, act.recipient_country_percentages[1].percentage) def test_recipient_region_percentages(self): act = self.act - self.assertEquals(2, len(act.recipient_region_percentages)) - self.assertEquals( + self.assertEqual(2, len(act.recipient_region_percentages)) + self.assertEqual( cl2.Region.south_america_regional, act.recipient_region_percentages[0].region) - self.assertEquals( + self.assertEqual( cl2.Region.south_of_sahara_regional, act.recipient_region_percentages[1].region) - self.assertEquals( + self.assertEqual( 25, act.recipient_region_percentages[0].percentage) - self.assertEquals( + self.assertEqual( 25, act.recipient_region_percentages[1].percentage) @@ -160,146 +160,146 @@ def test_misc_narratives(self): ''' ), major_version='2') - self.assertEquals( + self.assertEqual( "N1", act.recipient_country_percentages[0].name) - self.assertEquals( + self.assertEqual( "N2", act.recipient_region_percentages[0].name) - self.assertEquals( + self.assertEqual( "N3", act.sector_percentages[0].text) - self.assertEquals( + self.assertEqual( "N4", act.policy_markers[0].text) - self.assertEquals( + self.assertEqual( "N5", act.related_activities[0].text) def test_transaction_count(self): - self.assertEquals(1, len(self.act.transactions)) + self.assertEqual(1, len(self.act.transactions)) def test_transaction_type(self): - self.assertEquals( + self.assertEqual( cl2.TransactionType.incoming_funds, self.act.transactions[0].type) def test_transaction_date(self): - self.assertEquals( + self.assertEqual( datetime.date(2012, 1, 1), self.act.transactions[0].date) def test_transaction_value_date(self): - self.assertEquals( + self.assertEqual( datetime.date(2012, 1, 1), self.act.transactions[0].value_date) def test_transaction_value_amount(self): - self.assertEquals( + self.assertEqual( 1000, self.act.transactions[0].value_amount) def test_transaction_currency(self): - self.assertEquals( + self.assertEqual( cl2.Currency.euro, self.act.transactions[0].value_currency) def test_transaction_value_composite(self): - self.assertEquals( + self.assertEqual( (datetime.date(2012, 1, 1), 1000, cl2.Currency.euro), self.act.transactions[0].value) def test_transaction_ref(self): - self.assertEquals(u'1234', self.act.transactions[0].ref) + self.assertEqual(u'1234', self.act.transactions[0].ref) def test_transaction_description(self): - self.assertEquals(u'Transaction description text', + self.assertEqual(u'Transaction description text', self.act.transactions[0].description) def test_transaction_provider_org_ref(self): - self.assertEquals(u'BB-BBB-123456789', + self.assertEqual(u'BB-BBB-123456789', self.act.transactions[0].provider_org.ref) def test_transaction_provider_org_name(self): - self.assertEquals(u'Agency B', + self.assertEqual(u'Agency B', self.act.transactions[0].provider_org.name) def test_transaction_reciever_org_ref(self): - self.assertEquals(u'AA-AAA-123456789', + self.assertEqual(u'AA-AAA-123456789', self.act.transactions[0].receiver_org.ref) def test_transaction_reciever_org_name(self): - self.assertEquals(u'Agency A', + self.assertEqual(u'Agency A', self.act.transactions[0].receiver_org.name) def test_transaction_new_elements(self): act = self.act - self.assertEquals(1, len(act.transactions[0].recipient_region_percentages)) - self.assertEquals(1, len(act.transactions[0].recipient_country_percentages)) - self.assertEquals(1, len(act.transactions[0].sector_percentages)) - self.assertEquals( + self.assertEqual(1, len(act.transactions[0].recipient_region_percentages)) + self.assertEqual(1, len(act.transactions[0].recipient_country_percentages)) + self.assertEqual(1, len(act.transactions[0].sector_percentages)) + self.assertEqual( cl2.Country.afghanistan, act.transactions[0].recipient_country_percentages[0].country) - self.assertEquals( + self.assertEqual( u'456', act.transactions[0].recipient_region_percentages[0].region.value) - self.assertEquals( + self.assertEqual( u'111', act.transactions[0].sector_percentages[0].sector.value) def test_date_start_planned(self): - self.assertEquals(datetime.date(2012, 4, 15), self.act.start_planned) + self.assertEqual(datetime.date(2012, 4, 15), self.act.start_planned) def test_date_start_actual(self): - self.assertEquals(datetime.date(2012, 4, 28), self.act.start_actual) + self.assertEqual(datetime.date(2012, 4, 28), self.act.start_actual) def test_date_end_planned(self): - self.assertEquals(datetime.date(2015, 12, 31), self.act.end_planned) + self.assertEqual(datetime.date(2015, 12, 31), self.act.end_planned) def test_date_end_actual(self): - self.assertEquals(None, self.act.end_actual) + self.assertEqual(None, self.act.end_actual) def test_raw_xml(self): norm_xml = ET.tostring(ET.parse(fixture_filename("2.01-example-annotated.xml")).find('iati-activity'), encoding='utf-8').decode("utf-8") - self.assertEquals(norm_xml, self.act.raw_xml) + self.assertEqual(norm_xml, self.act.raw_xml) def test_budget(self): - self.assertEquals(1, len(self.act.budgets)) + self.assertEqual(1, len(self.act.budgets)) def test_policy_markers(self): - self.assertEquals(2, len(self.act.policy_markers)) - self.assertEquals(cl2.PolicyMarker.aid_to_environment, self.act.policy_markers[0].code) - self.assertEquals(cl2.PolicyMarker.gender_equality, self.act.policy_markers[1].code) + self.assertEqual(2, len(self.act.policy_markers)) + self.assertEqual(cl2.PolicyMarker.aid_to_environment, self.act.policy_markers[0].code) + self.assertEqual(cl2.PolicyMarker.gender_equality, self.act.policy_markers[1].code) def test_policy_markers_significance(self): - self.assertEquals(2, len(self.act.policy_markers)) - self.assertEquals(cl2.PolicySignificance.principal_objective_and_in_support_of_an_action_programme, self.act.policy_markers[0].significance) - self.assertEquals(cl2.PolicySignificance.explicit_primary_objective, self.act.policy_markers[1].significance) + self.assertEqual(2, len(self.act.policy_markers)) + self.assertEqual(cl2.PolicySignificance.principal_objective_and_in_support_of_an_action_programme, self.act.policy_markers[0].significance) + self.assertEqual(cl2.PolicySignificance.explicit_primary_objective, self.act.policy_markers[1].significance) def test_related_activity(self): - self.assertEquals(1, len(self.act.related_activities)) - self.assertEquals("AA-AAA-123456789-6789", self.act.related_activities[0].ref) + self.assertEqual(1, len(self.act.related_activities)) + self.assertEqual("AA-AAA-123456789-6789", self.act.related_activities[0].ref) def test_activity_status(self): - self.assertEquals(cl2.ActivityStatus.implementation, self.act.activity_status) + self.assertEqual(cl2.ActivityStatus.implementation, self.act.activity_status) def test_collaboration_type(self): - self.assertEquals(cl2.CollaborationType.bilateral, self.act.collaboration_type) + self.assertEqual(cl2.CollaborationType.bilateral, self.act.collaboration_type) def test_default_finance_type(self): - self.assertEquals(cl2.FinanceType.standard_grant, + self.assertEqual(cl2.FinanceType.standard_grant, self.act.default_finance_type) def test_default_flow_type(self): - self.assertEquals(cl2.FlowType.oda, self.act.default_flow_type) + self.assertEqual(cl2.FlowType.oda, self.act.default_flow_type) def test_default_aid_type(self): - self.assertEquals(cl2.AidType.general_budget_support, + self.assertEqual(cl2.AidType.general_budget_support, self.act.default_aid_type) def test_default_tied_status(self): - self.assertEquals(cl2.TiedStatus.partially_tied, self.act.default_tied_status) + self.assertEqual(cl2.TiedStatus.partially_tied, self.act.default_tied_status) def test_default_hierarchy(self): - self.assertEquals(1, self.act.hierarchy) + self.assertEqual(1, self.act.hierarchy) def test_default_language(self): - self.assertEquals(cl2.Language.english, self.act.default_language) + self.assertEqual(cl2.Language.english, self.act.default_language) class TestParseActivity(AppTestCase): @@ -312,224 +312,224 @@ def test_bad_xml(self): parse.activity(parse_fixture("broken.xml")) def test_id(self): - self.assertEquals( + self.assertEqual( u"47045-ARM-202-G05-H-00", self.act.iati_identifier) def test_title(self): - self.assertEquals( + self.assertEqual( (u"Support to the National Program on the Response to HIV " + u"Epicemic in the Republic of Armenia"), self.act.title) def test_last_updated_time(self): - self.assertEquals(datetime.date(2012, 9, 25), self.act.last_updated_datetime) + self.assertEqual(datetime.date(2012, 9, 25), self.act.last_updated_datetime) def test_description(self): - self.assert_(self.act.description.startswith( + self.assertTrue(self.act.description.startswith( u"While Armenia is still a country with a concentrated HIV")) def test_reporting_org_ref(self): - self.assertEquals(u"47045", self.act.reporting_org.ref) + self.assertEqual(u"47045", self.act.reporting_org.ref) def test_reporting_org_type(self): - self.assertEquals( + self.assertEqual( cl.OrganisationType.multilateral, self.act.reporting_org.type ) def test_activity_websites(self): - self.assertEquals( + self.assertEqual( [u"http://portfolio.theglobalfund.org/en/Grant/Index/ARM-202-G05-H-00"], self.act.websites) def test_default_currency(self): - self.assertEquals( + self.assertEqual( cl.Currency.us_dollar, self.act.default_currency ) def test_participating_org(self): - self.assertEquals( + self.assertEqual( cl.OrganisationRole.funding, self.act.participating_orgs[0].role) def test_accepts_participatng_org_without_ref(self): - self.assertEquals(2, len(self.act.participating_orgs)) + self.assertEqual(2, len(self.act.participating_orgs)) def test_recipient_country_percentages(self): - self.assertEquals(1, len(self.act.recipient_country_percentages)) - self.assertEquals( + self.assertEqual(1, len(self.act.recipient_country_percentages)) + self.assertEqual( cl.Country.armenia, self.act.recipient_country_percentages[0].country) - self.assertEquals( + self.assertEqual( "Armenia", self.act.recipient_country_percentages[0].name) - self.assertEquals( + self.assertEqual( None, self.act.recipient_country_percentages[0].percentage) def test_recipient_region_percentages(self): act = parse.activity(parse_fixture("iati_activity_JP.xml")) - self.assertEquals(1, len(act.recipient_region_percentages)) - self.assertEquals( + self.assertEqual(1, len(act.recipient_region_percentages)) + self.assertEqual( cl.Country.japan, act.recipient_country_percentages[0].country) - self.assertEquals( + self.assertEqual( "Far East Asia, regional", act.recipient_region_percentages[0].name) - self.assertEquals( + self.assertEqual( 100, act.recipient_region_percentages[0].percentage) def test_transaction_count(self): - self.assertEquals(1, len(self.act.transactions)) + self.assertEqual(1, len(self.act.transactions)) def test_transaction_type(self): - self.assertEquals( + self.assertEqual( cl.TransactionType.commitment, self.act.transactions[0].type) def test_transaction_date(self): - self.assertEquals( + self.assertEqual( datetime.date(2009, 10, 1), self.act.transactions[0].date) def test_transaction_value_date(self): - self.assertEquals( + self.assertEqual( datetime.date(2009, 10, 1), self.act.transactions[0].value_date) def test_transaction_value_amount(self): - self.assertEquals( + self.assertEqual( 3991675, self.act.transactions[0].value_amount) def test_transaction_currency(self): # currency is picked up from default currency act = parse.activity(parse_fixture("transaction_provider.xml")) - self.assertEquals( + self.assertEqual( cl.Currency.pound_sterling, act.transactions[0].value_currency) def test_transaction_value_composite(self): act = parse.activity(parse_fixture("transaction_provider.xml")) - self.assertEquals( + self.assertEqual( (datetime.date(2011, 8, 19), 29143, cl.Currency.pound_sterling), act.transactions[0].value) def test_transaction_ref(self): act = parse.activity(parse_fixture("transaction_ref.xml")) - self.assertEquals(u'36258', act.transactions[0].ref) - self.assertEquals(None, act.transactions[1].ref) + self.assertEqual(u'36258', act.transactions[0].ref) + self.assertEqual(None, act.transactions[1].ref) def test_transaction_provider_org_ref(self): act = parse.activity(parse_fixture("transaction_provider.xml")) - self.assertEquals(u'GB-1-201242-101', + self.assertEqual(u'GB-1-201242-101', act.transactions[0].provider_org.ref) def test_transaction_reciever_org_ref(self): act = parse.activity(parse_fixture("transaction_provider.xml")) - self.assertEquals(u'GB-CHC-313139', + self.assertEqual(u'GB-CHC-313139', act.transactions[0].receiver_org.ref) def test_date_start_planned(self): - self.assertEquals(datetime.date(2009, 10, 3), self.act.start_planned) + self.assertEqual(datetime.date(2009, 10, 3), self.act.start_planned) def test_date_start_actual(self): - self.assertEquals(datetime.date(2009, 10, 1), self.act.start_actual) + self.assertEqual(datetime.date(2009, 10, 1), self.act.start_actual) def test_date_end_planned(self): - self.assertEquals(datetime.date(2009, 10, 4), self.act.end_planned) + self.assertEqual(datetime.date(2009, 10, 4), self.act.end_planned) def test_date_end_actual(self): - self.assertEquals(datetime.date(2009, 10, 2), self.act.end_actual) + self.assertEqual(datetime.date(2009, 10, 2), self.act.end_actual) def test_sector_percentage_count(self): act = next(parse.document_from_file( fixture_filename("complex_example_dfid.xml"))) - self.assertEquals(5, len(act.sector_percentages)) + self.assertEqual(5, len(act.sector_percentages)) def test_raw_xml(self): norm_xml = ET.tostring(ET.parse(fixture_filename("default_currency.xml"))).decode("utf-8") - self.assertEquals(norm_xml, self.act.raw_xml) + self.assertEqual(norm_xml, self.act.raw_xml) def test_no_start_actual(self): activities = parse.document_from_file(fixture_filename("missing_dates.xml")) act = {a.iati_identifier: a for a in activities} - self.assertEquals(None, act[u"GB-CHC-272465-680"].start_actual) + self.assertEqual(None, act[u"GB-CHC-272465-680"].start_actual) def test_budget(self): - self.assertEquals(6, len(self.act.budgets)) + self.assertEqual(6, len(self.act.budgets)) def test_policy_markers(self): activities = [a for a in parse.document_from_file(fixture_filename("CD.xml"))] - self.assertEquals(8, len(activities[1].policy_markers)) - self.assertEquals(cl.PolicyMarker.gender_equality, activities[1].policy_markers[0].code) - self.assertEquals(cl.PolicyMarker.aid_to_environment, activities[1].policy_markers[1].code) - self.assertEquals( + self.assertEqual(8, len(activities[1].policy_markers)) + self.assertEqual(cl.PolicyMarker.gender_equality, activities[1].policy_markers[0].code) + self.assertEqual(cl.PolicyMarker.aid_to_environment, activities[1].policy_markers[1].code) + self.assertEqual( cl.PolicyMarker.participatory_developmentgood_governance, activities[1].policy_markers[2].code) - self.assertEquals(cl.PolicyMarker.trade_development, activities[1].policy_markers[3].code) + self.assertEqual(cl.PolicyMarker.trade_development, activities[1].policy_markers[3].code) def test_policy_markers_significance(self): activities = [a for a in parse.document_from_file(fixture_filename("CD.xml"))] - self.assertEquals(8, len(activities[1].policy_markers)) - self.assertEquals(cl.PolicySignificance.significant_objective, activities[1].policy_markers[0].significance) - self.assertEquals(cl.PolicySignificance.not_targeted, activities[1].policy_markers[1].significance) - self.assertEquals( + self.assertEqual(8, len(activities[1].policy_markers)) + self.assertEqual(cl.PolicySignificance.significant_objective, activities[1].policy_markers[0].significance) + self.assertEqual(cl.PolicySignificance.not_targeted, activities[1].policy_markers[1].significance) + self.assertEqual( cl.PolicySignificance.significant_objective, activities[1].policy_markers[2].significance) - self.assertEquals(cl.PolicySignificance.not_targeted, activities[1].policy_markers[3].significance) + self.assertEqual(cl.PolicySignificance.not_targeted, activities[1].policy_markers[3].significance) def test_related_activity(self): activities = [a for a in parse.document_from_file(fixture_filename("CD.xml"))] - self.assertEquals(4, len(activities[0].related_activities)) - self.assertEquals("GB-1-105838-101", activities[0].related_activities[0].ref) + self.assertEqual(4, len(activities[0].related_activities)) + self.assertEqual("GB-1-105838-101", activities[0].related_activities[0].ref) def test_activity_status(self): activities = [a for a in parse.document_from_file(fixture_filename("default_currency.xml"))] - self.assertEquals(cl.ActivityStatus.implementation, activities[0].activity_status) + self.assertEqual(cl.ActivityStatus.implementation, activities[0].activity_status) def test_collaboration_type(self): activities = [a for a in parse.document_from_file(fixture_filename("CD.xml"))] - self.assertEquals(cl.CollaborationType.bilateral, activities[1].collaboration_type) + self.assertEqual(cl.CollaborationType.bilateral, activities[1].collaboration_type) def test_default_finance_type(self): activities = [a for a in parse.document_from_file(fixture_filename("CD.xml"))] - self.assertEquals( + self.assertEqual( cl.FinanceType.standard_grant, activities[1].default_finance_type) def test_default_flow_type(self): activities = [a for a in parse.document_from_file(fixture_filename("CD.xml"))] - self.assertEquals(cl.FlowType.oda, activities[1].default_flow_type) + self.assertEqual(cl.FlowType.oda, activities[1].default_flow_type) def test_default_aid_type(self): activities = [a for a in parse.document_from_file(fixture_filename("CD.xml"))] - self.assertEquals( + self.assertEqual( cl.AidType.projecttype_interventions, activities[1].default_aid_type) def test_default_tied_status(self): activities = [a for a in parse.document_from_file(fixture_filename("CD.xml"))] - self.assertEquals(cl.TiedStatus.untied, activities[1].default_tied_status) + self.assertEqual(cl.TiedStatus.untied, activities[1].default_tied_status) def test_default_hierarchy(self): activities = [a for a in parse.document_from_file(fixture_filename("default_currency.xml"))] - self.assertEquals(1, activities[0].hierarchy) + self.assertEqual(1, activities[0].hierarchy) def test_default_language(self): activities = [a for a in parse.document_from_file(fixture_filename("default_currency.xml"))] - self.assertEquals(cl.Language.english, activities[0].default_language) + self.assertEqual(cl.Language.english, activities[0].default_language) def test_default_language_none(self): default_language = parse.default_language( ET.XML('')) - self.assertEquals(cl.Language.english, default_language) + self.assertEqual(cl.Language.english, default_language) no_default_language = parse.default_language( ET.XML('')) - self.assertEquals(None, no_default_language) + self.assertEqual(None, no_default_language) class TestFunctional(AppTestCase): @@ -580,29 +580,29 @@ def test_decimal_percentages(self): db.session.add(act) db.session.commit() - self.assertEquals( + self.assertEqual( 24.5, db.session.query(model.CountryPercentage).filter(model.CountryPercentage.country==cl.Country.afghanistan).first().percentage ) - self.assertEquals( + self.assertEqual( 25.5, db.session.query(model.CountryPercentage).filter(model.CountryPercentage.country==cl.Country.antigua_and_barbuda).first().percentage ) - self.assertEquals( + self.assertEqual( 26.5, db.session.query(model.RegionPercentage).filter(model.RegionPercentage.region==cl.Region.asia_regional).first().percentage ) - self.assertEquals( + self.assertEqual( 23.5, db.session.query(model.RegionPercentage).filter(model.RegionPercentage.region==cl.Region.oceania_regional).first().percentage ) - self.assertEquals( + self.assertEqual( 49.5, db.session.query(model.SectorPercentage).filter(model.SectorPercentage.sector==cl.Sector.teacher_training).first().percentage ) - self.assertEquals( + self.assertEqual( 50.5, db.session.query(model.SectorPercentage).filter(model.SectorPercentage.sector==cl.Sector.educational_research).first().percentage ) @@ -617,11 +617,11 @@ def test_version_stored_1(self): db.session.add(act) db.session.commit() - self.assertEquals( + self.assertEqual( '1', db.session.query(model.Activity).first().major_version ) - self.assertEquals( + self.assertEqual( '1.05', db.session.query(model.Activity).first().version ) @@ -636,11 +636,11 @@ def test_version_stored_2(self): db.session.add(act) db.session.commit() - self.assertEquals( + self.assertEqual( '2', db.session.query(model.Activity).first().major_version ) - self.assertEquals( + self.assertEqual( '2.01', db.session.query(model.Activity).first().version ) @@ -651,20 +651,20 @@ def test_code(self): sec = parse.sector_percentages(ET.XML( u'Child Protection Systems Strengthening' ))[0] - self.assertEquals(cl.Sector.social_protection, sec.sector) - self.assertEquals(u"Child Protection Systems Strengthening", sec.text) + self.assertEqual(cl.Sector.social_protection, sec.sector) + self.assertEqual(u"Child Protection Systems Strengthening", sec.text) def test_missing_code(self): sec = parse.sector_percentages(ET.XML( u'Child Protection Systems Strengthening' ))[0] - self.assertEquals(None, sec.sector) + self.assertEqual(None, sec.sector) def test_missing_everything(self): sec = parse.sector_percentages(ET.XML( u'' )) - self.assertEquals([], sec) + self.assertEqual([], sec) class TestPercentages(AppTestCase): @@ -672,7 +672,7 @@ def test_recipient_country_percentages(self): recipient_country_percentages = parse.recipient_country_percentages(ET.XML( u'' )) - self.assertEquals(3, recipient_country_percentages[0].percentage) + self.assertEqual(3, recipient_country_percentages[0].percentage) def test_recipient_region_percentages(self): recipient_region_percentages = parse.recipient_region_percentages(ET.XML( @@ -681,8 +681,8 @@ def test_recipient_region_percentages(self): """ )) - self.assertEquals(4, recipient_region_percentages[0].percentage) - self.assertEquals(None, recipient_region_percentages[1].percentage) + self.assertEqual(4, recipient_region_percentages[0].percentage) + self.assertEqual(None, recipient_region_percentages[1].percentage) class TestOrganisation(AppTestCase): @@ -691,19 +691,19 @@ def test_org_role_looseness(self): orgrole = parse.participating_orgs(ET.XML( u'' ))[0] - self.assertEquals(orgrole.role, cl.OrganisationRole.implementing) + self.assertEqual(orgrole.role, cl.OrganisationRole.implementing) def test_org_type(self): orgtype = parse.reporting_org(ET.XML( u"""""" )) - self.assertEquals(cl.OrganisationType.international_ngo, orgtype.type) + self.assertEqual(cl.OrganisationType.international_ngo, orgtype.type) def test_org_type_missing(self): orgtype = parse.reporting_org(ET.XML( u"""""" )) - self.assertEquals(None, orgtype.type) + self.assertEqual(None, orgtype.type) class TestParticipation(AppTestCase): @@ -717,7 +717,7 @@ def test_repeated_participation(self): """), ) - self.assertEquals(1, len(participations)) + self.assertEqual(1, len(participations)) def test_same_org_different_role(self): participations = parse.participating_orgs( @@ -727,7 +727,7 @@ def test_same_org_different_role(self): """) ) - self.assertEquals(2, len(participations)) + self.assertEqual(2, len(participations)) class TestActivity(AppTestCase): @@ -742,14 +742,14 @@ def test_missing_id(self): ''') - self.assertEquals(0, len(list(activities))) + self.assertEqual(0, len(list(activities))) def test_dates(self): activities = list(parse.document_from_file(fixture_filename("CD.xml"))) - self.assertEquals(datetime.date(2004, 1, 1), activities[0].start_planned) - self.assertEquals(datetime.date(2004, 1, 1), activities[0].start_actual) - self.assertEquals(datetime.date(2010, 12, 31), activities[0].end_planned) - self.assertEquals(datetime.date(2010, 12, 31), activities[0].end_actual) + self.assertEqual(datetime.date(2004, 1, 1), activities[0].start_planned) + self.assertEqual(datetime.date(2004, 1, 1), activities[0].start_actual) + self.assertEqual(datetime.date(2010, 12, 31), activities[0].end_planned) + self.assertEqual(datetime.date(2010, 12, 31), activities[0].end_actual) def test_missing_reporting_org(self): # missing reporting org should still parse @@ -762,8 +762,8 @@ def test_missing_reporting_org(self): ''')) - self.assertEquals(1, len(activities)) - self.assertEquals(u"AAA-AA", activities[0].iati_identifier) + self.assertEqual(1, len(activities)) + self.assertEqual(u"AAA-AA", activities[0].iati_identifier) class TestTransaction(AppTestCase): @@ -791,7 +791,7 @@ def test_missing_code(self): Disbursement ''') ) - self.assertEquals(1, len(transactions)) + self.assertEqual(1, len(transactions)) def test_big_value(self): transaction = parse.transactions( @@ -802,7 +802,7 @@ def test_big_value(self): Disbursement ''') )[0] - self.assertEquals(2663000000, transaction.value_amount) + self.assertEqual(2663000000, transaction.value_amount) @mock.patch('iatilib.parse.iati_decimal') def test_iati_int_called(self, mock): @@ -814,7 +814,7 @@ def test_iati_int_called(self, mock): Disbursement ''') )[0] - self.assertEquals(1, mock.call_count) + self.assertEqual(1, mock.call_count) def test_provider_activity_id(self): sample = """ @@ -827,7 +827,7 @@ def test_provider_activity_id(self): """ transaction = parse.transactions(ET.XML(sample))[0] - self.assertEquals(u'GB-1-202907', transaction.provider_org_activity_id) + self.assertEqual(u'GB-1-202907', transaction.provider_org_activity_id) def test_provider_org_text(self): sample = """ @@ -838,7 +838,7 @@ def test_provider_org_text(self): """ transaction = parse.transactions(ET.XML(sample))[0] - self.assertEquals(u'DFID', transaction.provider_org_text) + self.assertEqual(u'DFID', transaction.provider_org_text) def test_receiver_activity_id(self): sample = """ @@ -849,7 +849,7 @@ def test_receiver_activity_id(self): """ transaction = parse.transactions(ET.XML(sample))[0] - self.assertEquals(u'GB-CHC-1068839-dfid_ag_11-13', transaction.receiver_org_activity_id) + self.assertEqual(u'GB-CHC-1068839-dfid_ag_11-13', transaction.receiver_org_activity_id) def test_receiver_org_text(self): sample = """ @@ -860,7 +860,7 @@ def test_receiver_org_text(self): """ transaction = parse.transactions(ET.XML(sample))[0] - self.assertEquals(u'Bond', transaction.receiver_org_text) + self.assertEqual(u'Bond', transaction.receiver_org_text) def test_description(self): sample = """ @@ -870,30 +870,30 @@ def test_description(self): """ transaction = parse.transactions(ET.XML(sample))[0] - self.assertEquals( + self.assertEqual( u'Funds received from DFID for activities in Aug- Sept 2011', transaction.description ) def test_flow_type(self): transaction = parse.transactions(ET.XML(self.codelists))[0] - self.assertEquals(u'30', transaction.flow_type.value) + self.assertEqual(u'30', transaction.flow_type.value) def test_finance_type(self): transaction = parse.transactions(ET.XML(self.codelists))[0] - self.assertEquals(u'110', transaction.finance_type.value) + self.assertEqual(u'110', transaction.finance_type.value) def test_aid_type(self): transaction = parse.transactions(ET.XML(self.codelists))[0] - self.assertEquals(u'B01', transaction.aid_type.value) + self.assertEqual(u'B01', transaction.aid_type.value) def test_tied_status(self): transaction = parse.transactions(ET.XML(self.codelists))[0] - self.assertEquals(u'5', transaction.tied_status.value) + self.assertEqual(u'5', transaction.tied_status.value) def test_disbursement_channel(self): transaction = parse.transactions(ET.XML(self.codelists))[0] - self.assertEquals(u'2', transaction.disbursement_channel.value) + self.assertEqual(u'2', transaction.disbursement_channel.value) class TestBudget(TestCase): @@ -909,7 +909,7 @@ def parse_budget(self): def test_budget_type(self): budget = self.parse_budget() - self.assertEquals(budget.type, cl.BudgetType.original) + self.assertEqual(budget.type, cl.BudgetType.original) def test_budget_type_looser(self): budget = parse.budgets(ET.XML(""" @@ -920,65 +920,65 @@ def test_budget_type_looser(self): """))[0] - self.assertEquals(budget.type, cl.BudgetType.original) + self.assertEqual(budget.type, cl.BudgetType.original) def test_budget_period_end(self): budget = self.parse_budget() - self.assertEquals(budget.period_end, datetime.date(2010, 3, 31)) + self.assertEqual(budget.period_end, datetime.date(2010, 3, 31)) def test_budget_period_start(self): budget = self.parse_budget() - self.assertEquals(budget.period_start, None) + self.assertEqual(budget.period_start, None) def test_value_currency(self): budget = self.parse_budget() - self.assertEquals(budget.value_currency, cl.Currency.us_dollar) + self.assertEqual(budget.value_currency, cl.Currency.us_dollar) def test_value_amount(self): budget = self.parse_budget() - self.assertEquals(budget.value_amount, 1840852) + self.assertEqual(budget.value_amount, 1840852) class TestDates(TestCase): def test_correct_date(self): - self.assertEquals( + self.assertEqual( datetime.date(2010, 1, 2), parse.iati_date("2010-01-02")) def test_variation_1(self): - self.assertEquals( + self.assertEqual( datetime.date(2011, 12, 31), parse.iati_date("31/12/2011")) def test_iso_date_with_z(self): - self.assertEquals( + self.assertEqual( datetime.date(2010, 1, 2), parse.iati_date("2010-01-02Z")) def test_iso_date_with_timezone(self): - self.assertEquals( + self.assertEqual( datetime.date(2010, 1, 2), parse.iati_date("2010-01-02+06:00")) - self.assertEquals( + self.assertEqual( datetime.date(2010, 1, 2), parse.iati_date("2010-01-02-06:00")) class TestValue(TestCase): def test_thousand_sep(self): - self.assertEquals(20026, parse.iati_int(u"20,026")) + self.assertEqual(20026, parse.iati_int(u"20,026")) def test_sign(self): - self.assertEquals(-20026, parse.iati_int(u"-20026")) + self.assertEqual(-20026, parse.iati_int(u"-20026")) def test_decimal_thousand_sep(self): - self.assertEquals(Decimal('20026'), parse.iati_decimal(u"20,026")) + self.assertEqual(Decimal('20026'), parse.iati_decimal(u"20,026")) def test_decimal_sign(self): - self.assertEquals(Decimal('-20026'), parse.iati_decimal(u"-20026")) + self.assertEqual(Decimal('-20026'), parse.iati_decimal(u"-20026")) def test_decimal(self): - self.assertEquals(Decimal('42479.4'), parse.iati_decimal(u"42479.4")) + self.assertEqual(Decimal('42479.4'), parse.iati_decimal(u"42479.4")) class TestXVal(TestCase): @@ -987,6 +987,6 @@ def test_missing_val(self): parse.xval(ET.XML(u""), "bar") def test_default_val(self): - self.assertEquals( + self.assertEqual( None, parse.xval(ET.XML(u""), "bar", None)) diff --git a/iati_datastore/iatilib/test/test_serializers/__init__.py b/iati_datastore/iatilib/test/test_serializers/__init__.py index cddd558c..8d7bc1fa 100644 --- a/iati_datastore/iatilib/test/test_serializers/__init__.py +++ b/iati_datastore/iatilib/test/test_serializers/__init__.py @@ -23,4 +23,4 @@ def assertField(self, mapping, row): assert len(mapping) == 1 key, val = list(mapping.items())[0] self.assertIn(key, row) - self.assertEquals(row[key], val) + self.assertEqual(row[key], val) diff --git a/iati_datastore/iatilib/test/test_serializers/test_csv_activities.py b/iati_datastore/iatilib/test/test_serializers/test_csv_activities.py index 78332bc3..7ab75ae6 100644 --- a/iati_datastore/iatilib/test/test_serializers/test_csv_activities.py +++ b/iati_datastore/iatilib/test/test_serializers/test_csv_activities.py @@ -25,18 +25,18 @@ def serialize(self, data): class TestCSVSerializer(CSVTstMixin, TestCase): def test_empty(self): data = self.process([]) - self.assertEquals(0, len(data)) + self.assertEqual(0, len(data)) def test_len_one(self): data = self.process([fac.ActivityFactory.build()]) - self.assertEquals(1, len(data)) + self.assertEqual(1, len(data)) def test_len_many(self): data = self.process([ fac.ActivityFactory.build(), fac.ActivityFactory.build() ]) - self.assertEquals(2, len(data)) + self.assertEqual(2, len(data)) def test_date_field(self): data = self.process([fac.ActivityFactory.build( @@ -703,7 +703,7 @@ def test_column_list(self): def test_no_rows(self): data = self.process(self.example()) - self.assertEquals(2, len(data)) + self.assertEqual(2, len(data)) def test_country_code_0(self): data = self.process(self.example()) @@ -869,7 +869,7 @@ def test_column_list(self): def test_no_rows(self): data = self.process(self.example()) - self.assertEquals(2, len(data)) + self.assertEqual(2, len(data)) def test_sector_code_0(self): data = self.process(self.example()) diff --git a/iati_datastore/iatilib/test/test_serializers/test_json.py b/iati_datastore/iatilib/test/test_serializers/test_json.py index 9d51a1e9..5962a844 100644 --- a/iati_datastore/iatilib/test/test_serializers/test_json.py +++ b/iati_datastore/iatilib/test/test_serializers/test_json.py @@ -63,7 +63,7 @@ def test_whitespace_in_identifier(self): activity = factories.ActivityFactory.create(raw_xml=raw_xml) json_output = jsonserializer.json(FakePage([activity])) output = json.load(StringIO(''.join(json_output))) - self.assertEquals('\n AAA\n ', output['iati-activities'][0]['iati-activity']['iati-identifier']) + self.assertEqual('\n AAA\n ', output['iati-activities'][0]['iati-activity']['iati-identifier']) def test_multiline(self): act_one = factories.ActivityFactory.create( @@ -72,15 +72,15 @@ def test_multiline(self): iati_identifier='ZZZ') json_output = json.loads(''.join(jsonserializer.json( FakePage([act_one, act_two])))) - self.assertEquals(2, len(json_output['iati-activities'])) + self.assertEqual(2, len(json_output['iati-activities'])) def test_version(self): activity = factories.ActivityFactory.create(version='x.yy') json_datastore_output = json.loads(''.join(jsonserializer.datastore_json(FakePage([activity])))) json_output = json.loads(''.join(jsonserializer.json(FakePage([activity])))) - self.assertEquals('x.yy', json_datastore_output['iati-activities'][0]['version']) + self.assertEqual('x.yy', json_datastore_output['iati-activities'][0]['version']) # This has the "iati-extra:" because it should match the XML output - self.assertEquals('x.yy', json_output['iati-activities'][0]['iati-extra:version']) + self.assertEqual('x.yy', json_output['iati-activities'][0]['iati-extra:version']) def test_wrapped(self): activity = factories.ActivityFactory.create() diff --git a/iati_datastore/iatilib/test/test_serializers/test_xml_activities.py b/iati_datastore/iatilib/test/test_serializers/test_xml_activities.py index cff5a6f3..fb0130c6 100644 --- a/iati_datastore/iatilib/test/test_serializers/test_xml_activities.py +++ b/iati_datastore/iatilib/test/test_serializers/test_xml_activities.py @@ -18,13 +18,13 @@ def test_raw(self): data = self.process([ fac.ActivityFactory.build(raw_xml=u"") ]) - self.assert_(data.find(".//test") is not None) + self.assertTrue(data.find(".//test") is not None) def test_unicode(self): data = self.process([ fac.ActivityFactory.build(raw_xml=u"\u2603") ]) - self.assertEquals(u"\u2603", data.find(".//test").text) + self.assertEqual(u"\u2603", data.find(".//test").text) def test_namespace(self): # raw xml that goes in with a ns prefix should come out with one @@ -39,19 +39,19 @@ def test_results_count(self): data = [fac.ActivityFactory.build(raw_xml=u"")] ser_data = "".join(serialize.xml(TestWrapper(data, 1, 0, 0))) result = ET.fromstring(ser_data) - self.assertEquals("1", result[1][0][0].text) + self.assertEqual("1", result[1][0][0].text) def test_version(self): data = self.process([ fac.ActivityFactory.build(raw_xml=u"", version='x.yy') ]) - self.assertEquals('x.yy', data.find('.//iati-activity').attrib['{https://datastore.codeforiati.org/ns}version']) + self.assertEqual('x.yy', data.find('.//iati-activity').attrib['{https://datastore.codeforiati.org/ns}version']) def test_wrapped(self): data = self.process([ fac.ActivityFactory.build() ]) - self.assertEquals(data.tag, 'result') + self.assertEqual(data.tag, 'result') self.assertIsNotNone(data.find('.//iati-activities')) self.assertIsNotNone(data.find('.//query')) @@ -59,6 +59,6 @@ def test_unwrapped(self): data = self.process([ fac.ActivityFactory.build() ], wrapped=False) - self.assertEquals(data.tag, 'iati-activities') + self.assertEqual(data.tag, 'iati-activities') self.assertIsNone(data.find('.//result')) self.assertIsNone(data.find('.//query')) diff --git a/iati_datastore/iatilib/test/test_validators.py b/iati_datastore/iatilib/test/test_validators.py index 9924c170..03f02c3f 100644 --- a/iati_datastore/iatilib/test/test_validators.py +++ b/iati_datastore/iatilib/test/test_validators.py @@ -7,7 +7,7 @@ class TestApiDate(TestCase): def test_valid_date(self): - self.assertEquals( + self.assertEqual( validators.apidate("2007-01-25"), datetime.date(2007, 1, 25) ) @@ -43,7 +43,7 @@ def test_max_per_page(self): validators.activity_api_args({"limit": 1000000}) def test_per_page_string(self): - self.assertEquals( + self.assertEqual( validators.activity_api_args({"limit": "10"}), {"limit": 10} ) @@ -52,19 +52,19 @@ def test_limit_zero(self): """ [#96] offset of zero should be allowed! """ - self.assertEquals( + self.assertEqual( validators.activity_api_args({"offset": "0"}), {"offset": 0} ) def test_date(self): - self.assertEquals( + self.assertEqual( validators.activity_api_args({"date": "2007-05-25"}), {"date": datetime.date(2007, 5, 25)} ) def test_stream(self): - self.assertEquals( + self.assertEqual( validators.activity_api_args({"stream": "t"}), {"stream": True} ) diff --git a/iati_datastore/setup.py b/iati_datastore/setup.py index 11bbf0a7..2c1e05a6 100644 --- a/iati_datastore/setup.py +++ b/iati_datastore/setup.py @@ -27,11 +27,11 @@ tests_require = """ fabric==2.5.0 fakeredis==1.4.5 -nose==1.3.7 mock==4.0.2 factory-boy==3.1.0 coveralls==2.2.0 coverage==5.3 +pytest==6.2.5 """ diff --git a/requirements_dev.txt b/requirements_dev.txt index c267e5e0..6be1122b 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,8 +1,8 @@ # If you update these, also update iati_datastore/setup.py -r requirements.txt fakeredis==1.4.5 -nose==1.3.7 mock==4.0.2 factory-boy==3.1.0 coveralls==2.2.0 coverage==5.3 +pytest==6.2.5