Increase tests coverage

Author: tpaviot

processscheduler/resource.py

@@ -44,14 +44,6 @@ def __init__(self, name: str, productivity: Optional[int] = 0) -> None:
             raise TypeError('productivity must be an integer >= 0')
         self.productivity = productivity
 
-    # Necessary to define _eq__ and __hash__ because of lgtm warnings of kind
-    def __hash__(self) -> int:
-        return self.uid
-
-    def __eq__(self, other) -> Bool:
-        return self.uid == other.uid
-
-
 class AlternativeWorkers(_Resource):
     """ Class representing the selection of n workers chosen among a list
     of possible workers """

processscheduler/task.py

@@ -55,13 +55,6 @@ def __init__(self, name: str) -> None:
         # optional flag, set to True if this task is optional, else True
         self.optional = False
 
-    # Necessary to define _eq__ and __hash__ because of lgtm warnings of kind
-    def __hash__(self) -> int:
-        return self.uid
-
-    def __eq__(self, other) -> Bool:
-        return self.uid == other.uid
-
     def set_optional(self):
         self.optional = True
 
@@ -145,15 +138,23 @@ def __init__(self, name: str,
                  length_at_most: Optional[int] = None,
                  work_amount: Optional[int] = 0):
         super().__init__(name)
+
+        if is_positive_integer(length_at_most):
+            self.add_assertion(self.duration <= length_at_most)
+        elif length_at_most is not None:
+            raise TypeError('length_as_most should either be a positive integer or None')
+
+        if not is_positive_integer(length_at_least):
+            raise TypeError('length_at_least must be a positive integer')
+
+        if not is_positive_integer(work_amount):
+            raise TypeError('work_amount me be a positive integer')
+
         self.length_at_least = length_at_least
         self.length_at_most = length_at_most
         self.work_amount = work_amount
 
         # set minimal duration
         self.add_assertion(self.duration >= length_at_least)
-
-        if length_at_most is not None:
-            self.add_assertion(self.duration <= length_at_most)
-
         # add an assertion: end = start + duration
         self.add_assertion(self.start + self.duration == self.end)

test/test_features.py

@@ -60,9 +60,22 @@ def test_create_task_fixed_duration(self) -> None:
             ps.FixedDurationTask('NegativeWorkAmount', 2, work_amount=-3)
 
     def test_create_task_variable_duration(self) -> None:
-        task = ps.VariableDurationTask('vdt')
-        self.assertIsInstance(task, ps.VariableDurationTask)
-
+        ps.VariableDurationTask('vdt1')
+        ps.VariableDurationTask('vdt2', length_at_most=4)
+        ps.VariableDurationTask('vdt3', length_at_least=4)
+        ps.VariableDurationTask('vdt21', work_amount=10)
+        with self.assertRaises(TypeError):
+            ps.VariableDurationTask('vdt3', length_at_most=4.5)
+        with self.assertRaises(TypeError):
+            ps.VariableDurationTask('vdt4', length_at_most=-1)
+        with self.assertRaises(TypeError):
+            ps.VariableDurationTask('vdt5', length_at_least=-1)
+        with self.assertRaises(TypeError):
+            ps.VariableDurationTask('vdt6', work_amount=-1)
+        with self.assertRaises(TypeError):
+            ps.VariableDurationTask('vdt7', work_amount=1.5)
+        with self.assertRaises(TypeError):
+            ps.VariableDurationTask('vdt8', work_amount=None)
     #
     # Workers
     #
@@ -94,7 +107,7 @@ def test_eq_overloading(self) -> None:
         self.assertEqual(task_1, task_1)
         self.assertNotEqual(task_1, task_2)
 
-    def test_redondnt_tasks_resources(self) -> None:
+    def test_redondant_tasks_resources(self) -> None:
         pb = ps.SchedulingProblem('ProblemRedundantTaskResource')
         # we should not be able to add twice the same resource or task
         task_1 = ps.ZeroDurationTask('task1')
@@ -124,6 +137,18 @@ def test_redondnt_tasks_resources(self) -> None:
             pb.add_resource(2.0)
         self.assertEqual(list(pb.get_resources()), [worker_1])
 
+    def test_resource_requirements(self) -> None:
+        task_1 = ps.FixedDurationTask('task1', duration=3)
+        worker_1 = ps.Worker('Worker1')
+        worker_2 = ps.Worker('Worker1')
+        worker_3 = ps.Worker('Worker1')
+        task_1.add_required_resource(worker_1)
+        task_1.add_required_resources([worker_1, worker_2])
+        with self.assertRaises(TypeError):
+            task_1.add_required_resource(3)
+        with self.assertRaises(TypeError):
+            task_1.add_required_resources("a_string")
+
     #
     # Single task constraints
     #