Changeset View
Changeset View
Standalone View
Standalone View
swh/storage/tests/test_storage.py
| Show First 20 Lines • Show All 1,379 Lines • ▼ Show 20 Lines | def test_origin_visit_add(self): | ||||
| origin_id = self.storage.origin_add_one(self.origin2) | origin_id = self.storage.origin_add_one(self.origin2) | ||||
| self.assertIsNotNone(origin_id) | self.assertIsNotNone(origin_id) | ||||
| # when | # when | ||||
| origin_visit1 = self.storage.origin_visit_add( | origin_visit1 = self.storage.origin_visit_add( | ||||
| origin_id, | origin_id, | ||||
| date=self.date_visit2) | date=self.date_visit2) | ||||
| origin_visit2 = self.storage.origin_visit_add( | |||||
| origin_id, | |||||
| date=str(self.date_visit3)) | |||||
douardda: as I already said in another diff (IIRC), I'd like to see the tested date written as a literal… | |||||
| # then | # then | ||||
| self.assertEqual(origin_visit1['origin'], origin_id) | self.assertEqual(origin_visit1['origin'], origin_id) | ||||
| self.assertIsNotNone(origin_visit1['visit']) | self.assertIsNotNone(origin_visit1['visit']) | ||||
| actual_origin_visits = list(self.storage.origin_visit_get(origin_id)) | actual_origin_visits = list(self.storage.origin_visit_get(origin_id)) | ||||
| self.assertEqual(actual_origin_visits, | self.assertEqual(actual_origin_visits, [ | ||||
| [{ | { | ||||
| 'origin': origin_id, | 'origin': origin_id, | ||||
| 'date': self.date_visit2, | 'date': self.date_visit2, | ||||
| 'visit': origin_visit1['visit'], | 'visit': origin_visit1['visit'], | ||||
| 'status': 'ongoing', | 'status': 'ongoing', | ||||
| 'metadata': None, | 'metadata': None, | ||||
| 'snapshot': None, | 'snapshot': None, | ||||
| }]) | }, | ||||
| { | |||||
| 'origin': origin_id, | |||||
| 'date': self.date_visit3, | |||||
| 'visit': origin_visit2['visit'], | |||||
| 'status': 'ongoing', | |||||
| 'metadata': None, | |||||
| 'snapshot': None, | |||||
| }, | |||||
| ]) | |||||
| expected_origin = self.origin2.copy() | expected_origin = self.origin2.copy() | ||||
| data = { | data1 = { | ||||
| 'origin': expected_origin, | 'origin': expected_origin, | ||||
| 'date': self.date_visit2, | 'date': self.date_visit2, | ||||
| 'visit': origin_visit1['visit'], | 'visit': origin_visit1['visit'], | ||||
| 'status': 'ongoing', | 'status': 'ongoing', | ||||
| 'metadata': None, | 'metadata': None, | ||||
| 'snapshot': None, | 'snapshot': None, | ||||
| } | } | ||||
| data2 = { | |||||
| 'origin': expected_origin, | |||||
| 'date': self.date_visit3, | |||||
| 'visit': origin_visit2['visit'], | |||||
| 'status': 'ongoing', | |||||
| 'metadata': None, | |||||
| 'snapshot': None, | |||||
| } | |||||
| self.assertEqual(list(self.journal_writer.objects), | self.assertEqual(list(self.journal_writer.objects), | ||||
| [('origin', expected_origin), | [('origin', expected_origin), | ||||
| ('origin_visit', data)]) | ('origin_visit', data1), | ||||
| ('origin_visit', data2)]) | |||||
| def test_origin_visit_update(self): | def test_origin_visit_update(self): | ||||
| # given | # given | ||||
| origin_id = self.storage.origin_add_one(self.origin2) | origin_id = self.storage.origin_add_one(self.origin2) | ||||
| origin_id2 = self.storage.origin_add_one(self.origin) | origin_id2 = self.storage.origin_add_one(self.origin) | ||||
| origin_visit1 = self.storage.origin_visit_add( | origin_visit1 = self.storage.origin_visit_add( | ||||
| origin_id, | origin_id, | ||||
| ▲ Show 20 Lines • Show All 1,937 Lines • Show Last 20 Lines | |||||
as I already said in another diff (IIRC), I'd like to see the tested date written as a literal string here.
TBH I do not like that much using these self.date_visit* member variables. There is no gain in using these rather than literals and it obfuscate (slightly) the code of these tests (which generally is tedious enough as is).