refactored the humanized_time method in utils to improve coverage.

Added the singleton test to the test_services to improve coverage.

edx_proctoring/tests/test_services.py

@@ -23,3 +23,11 @@ class TestProctoringService(unittest.TestCase):
             attr = getattr(edx_proctoring_api, attr_name, None)
             if isinstance(attr, types.FunctionType) and not attr_name.startswith('_'):
                 self.assertTrue(hasattr(service, attr_name))
+
+    def test_singleton(self):
+        """
+        Test to make sure the ProctoringService is a singleton.
+        """
+        service1 = ProctoringService()
+        service2 = ProctoringService()
+        self.assertIs(service1, service2)

edx_proctoring/tests/test_utils.py

@@ -42,3 +42,6 @@ class TestHumanizedTime(unittest.TestCase):
 
         human_time = humanized_time(180)
         self.assertEqual(human_time, "3 Hours")
+
+        human_time = humanized_time(-60)
+        self.assertEqual(human_time, "error")

edx_proctoring/utils.py

@@ -28,31 +28,33 @@ def humanized_time(time_in_minutes):
     hours = int(time_in_minutes / 60)
     minutes = time_in_minutes % 60
 
-    template = ""
-
     hours_present = False
     if hours == 0:
         hours_present = False
+        template = ""
     elif hours == 1:
         template = _("{num_of_hours} Hour")
         hours_present = True
     elif hours >= 2:
         template = _("{num_of_hours} Hours")
         hours_present = True
-
-    if minutes == 0:
-        if not hours_present:
-            template = _("{num_of_minutes} Minutes")
-    elif minutes == 1:
-        if hours_present:
-            template += _(" and {num_of_minutes} Minute")
-        else:
-            template += _("{num_of_minutes} Minute")
-    elif minutes >= 2:
-        if hours_present:
-            template += _(" and {num_of_minutes} Minutes")
+    else:
+        template = "error"
+
+    if template != "error":
+        if minutes == 0:
+            if not hours_present:
+                template = _("{num_of_minutes} Minutes")
+        elif minutes == 1:
+            if hours_present:
+                template += _(" and {num_of_minutes} Minute")
+            else:
+                template += _("{num_of_minutes} Minute")
         else:
-            template += _("{num_of_minutes} Minutes")
+            if hours_present:
+                template += _(" and {num_of_minutes} Minutes")
+            else:
+                template += _("{num_of_minutes} Minutes")
 
     human_time = template.format(num_of_hours=hours, num_of_minutes=minutes)
     return human_time