home · contact · privacy
Redirect / to /day, throw informative Exception on other unknown paths.
[plomtask] / tests / processes.py
index 17af14edfe5a6c5c773084ffe1c3a9df7f32b52e..e8967f70273e2345df966d599d50fdbeb4069e39 100644 (file)
@@ -3,7 +3,7 @@ from unittest import TestCase
 from urllib.parse import urlencode
 from tests.utils import TestCaseWithDB, TestCaseWithServer
 from plomtask.processes import Process
-from plomtask.misc import HandledException
+from plomtask.exceptions import NotFoundException, BadFormatException
 
 
 class TestsSansDB(TestCase):
@@ -25,10 +25,8 @@ class TestsWithDB(TestCaseWithDB):
         p_saved.save(self.db_conn)
         self.assertEqual(p_saved.id_,
                          Process.by_id(self.db_conn, 1, create=False).id_)
-        p_saved = Process(0)
-        p_saved.save(self.db_conn)
-        self.assertEqual(p_saved.id_,
-                         Process.by_id(self.db_conn, 2, create=False).id_)
+        with self.assertRaises(BadFormatException):
+            p_saved = Process(0)
         p_saved = Process(5)
         p_saved.save(self.db_conn)
         self.assertEqual(p_saved.id_,
@@ -42,16 +40,14 @@ class TestsWithDB(TestCaseWithDB):
 
     def test_Process_by_id(self) -> None:
         """Test Process.by_id()."""
-        with self.assertRaises(HandledException):
+        with self.assertRaises(NotFoundException):
             Process.by_id(self.db_conn, None, create=False)
-        with self.assertRaises(HandledException):
+        with self.assertRaises(NotFoundException):
             Process.by_id(self.db_conn, 0, create=False)
-        with self.assertRaises(HandledException):
+        with self.assertRaises(NotFoundException):
             Process.by_id(self.db_conn, 1, create=False)
         self.assertNotEqual(Process(1).id_,
                             Process.by_id(self.db_conn, None, create=True).id_)
-        self.assertNotEqual(Process(1).id_,
-                            Process.by_id(self.db_conn, 0, create=True).id_)
         self.assertEqual(Process(1).id_,
                          Process.by_id(self.db_conn, 1, create=True).id_)
         self.assertEqual(Process(2).id_,
@@ -100,7 +96,7 @@ class TestsWithServer(TestCaseWithServer):
         self.conn.request('GET', '/process?id=')
         self.assertEqual(self.conn.getresponse().status, 200)
         self.conn.request('GET', '/process?id=0')
-        self.assertEqual(self.conn.getresponse().status, 200)
+        self.assertEqual(self.conn.getresponse().status, 400)
         self.conn.request('GET', '/process?id=FOO')
         self.assertEqual(self.conn.getresponse().status, 400)
         self.conn.request('GET', '/processes')