Merge remote-tracking branch 'origin/feature-id' into feature-id

SABS-R3-Epidemiology · Nov 22, 2023 · 3807cc6 · 3807cc6
2 parents 3df1187 + 8c0d697
commit 3807cc6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/pyEpiabm/pyEpiabm/core/cell.py b/pyEpiabm/pyEpiabm/core/cell.py
@@ -4,9 +4,9 @@
 
 import typing
 import numpy as np
+import re
 from queue import Queue
 from numbers import Number
-import re
 
 from pyEpiabm.property import InfectionStatus
 from pyEpiabm.utility import DistanceFunctions

diff --git a/pyEpiabm/pyEpiabm/tests/test_unit/test_core/test_household.py b/pyEpiabm/pyEpiabm/tests/test_unit/test_core/test_household.py
@@ -65,6 +65,7 @@ def test_set_id(self):
         self.assertRaises(TypeError, subject.set_id, 2.0)
         self.assertRaises(ValueError, subject.set_id, "a.b.c")
         self.assertRaises(ValueError, subject.set_id, "0.0.")
+        self.assertRaises(ValueError, subject.set_id, "123")
         self.assertRaises(ValueError, subject.set_id, "0.0.0.0")
 
 

diff --git a/pyEpiabm/pyEpiabm/tests/test_unit/test_core/test_microcell.py b/pyEpiabm/pyEpiabm/tests/test_unit/test_core/test_microcell.py
@@ -25,8 +25,11 @@ def test_repr(self):
     def test_set_id(self):
         self.assertEqual(self.microcell.id, self.cell.id + "." +
                          str(len(self.cell.microcells)))
+        self.microcell.set_id("2.3")
+        self.assertEqual(self.microcell.id, "2.3")
         self.assertRaises(TypeError, self.microcell.set_id, 2.0)
         self.assertRaises(ValueError, self.microcell.set_id, "1.1.")
+        self.assertRaises(ValueError, self.microcell.set_id, "12")
 
     def test_add_person(self):
         self.assertEqual(len(self.microcell.persons), 0)