Use the actual Country type instead of the name.

We want other pieces of country information (in particular the short
names). This cleans up a lot of code anyway.

As an added bonus, this now catches squadrons that used invalid names
which would previously be passed through to pydcs and... then I don't
know what would happen.
This commit is contained in:
Dan Albert
2023-05-12 17:59:51 -07:00
parent 752a90cddb
commit bd2ec12e0f
23 changed files with 63 additions and 78 deletions

View File

@@ -41,7 +41,7 @@ class TestFactionLoader(unittest.TestCase):
with (RESOURCES_DIR / "valid_faction.json").open("r") as data:
faction = Faction.from_dict(json.load(data))
self.assertEqual(faction.country, "USA")
self.assertEqual(faction.country.name, "USA")
self.assertEqual(faction.name, "USA 2005")
self.assertEqual(faction.authors, "Khopa")
self.assertEqual(faction.description, "This is a test description")