fix: refactor some more for tests + pylint

This commit is contained in:
Lance Edgar 2025-08-31 18:17:18 -05:00
parent e494bdd2b9
commit 8c3948ff33
3 changed files with 36 additions and 11 deletions

View file

@ -406,11 +406,18 @@ class TestImporter(DataTestCase):
def test_normalize_source_object_all(self):
model = self.app.model
imp = self.make_importer(model_class=model.Setting)
# normal
setting = model.Setting()
result = imp.normalize_source_object_all(setting)
self.assertEqual(len(result), 1)
self.assertIs(result[0], setting)
# unwanted (normalized is None)
with patch.object(imp, "normalize_source_object", return_value=None):
result = imp.normalize_source_object_all(setting)
self.assertIsNone(result)
def test_normalize_source_object(self):
model = self.app.model
imp = self.make_importer(model_class=model.Setting)
@ -532,10 +539,16 @@ class TestImporter(DataTestCase):
def test_make_object(self):
model = self.app.model
# normal
imp = self.make_importer(model_class=model.Setting)
obj = imp.make_object()
self.assertIsInstance(obj, model.Setting)
# no model_class
imp = self.make_importer()
self.assertRaises(AttributeError, imp.make_object)
def test_update_target_object(self):
model = self.app.model
imp = self.make_importer(model_class=model.Setting)
@ -707,13 +720,20 @@ class TestToSqlalchemy(DataTestCase):
imp = self.make_importer(model_class=model.Setting, target_session=self.session)
setting = model.Setting(name="foo", value="bar")
# new object is added to session
# normal; new object is added to session
setting = imp.create_target_object(("foo",), {"name": "foo", "value": "bar"})
self.assertIsInstance(setting, model.Setting)
self.assertEqual(setting.name, "foo")
self.assertEqual(setting.value, "bar")
self.assertIn(setting, self.session)
# unwanted; parent class does not create the object
with patch.object(mod.Importer, "create_target_object", return_value=None):
setting = imp.create_target_object(
("foo",), {"name": "foo", "value": "bar"}
)
self.assertIsNone(setting)
def test_delete_target_object(self):
model = self.app.model

View file

@ -82,8 +82,8 @@ foo2,bar2
imp.input_file_path = self.data_path
imp.open_input_file()
imp.close_input_file()
self.assertFalse(hasattr(imp, "input_reader"))
self.assertFalse(hasattr(imp, "input_file"))
self.assertIsNone(imp.input_reader)
self.assertIsNone(imp.input_file)
def test_get_source_objects(self):
model = self.app.model