From abf648858a1a29d452f0efadf53bf5524dde31db Mon Sep 17 00:00:00 2001
From: Frederick Muriuki Muriithi
Date: Wed, 2 Aug 2023 10:06:35 +0300
Subject: Remove ORM-dependent `fetchall` and `fetchone` functions

Remove Object-Relational Mapping dependent function, `fetchall` and `fetchone`
so as to prevent theirs use in the code moving forward.
---
 tests/unit/db/test_db.py | 73 ------------------------------------------------
 1 file changed, 73 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/db/test_db.py b/tests/unit/db/test_db.py
index 821a6b6..5e146fd 100644
--- a/tests/unit/db/test_db.py
+++ b/tests/unit/db/test_db.py
@@ -4,13 +4,9 @@ from unittest import mock
 
 import pytest
 
-from gn3.db import fetchall
-from gn3.db import fetchone
 from gn3.db import update
 from gn3.db import diff_from_dict
-from gn3.db.probesets import Probeset
 from gn3.db.phenotypes import Phenotype
-from gn3.db.metadata_audit import MetadataAudit
 
 
 class TestCrudMethods(TestCase):
@@ -50,75 +46,6 @@ class TestCrudMethods(TestCase):
                 "Submitter = %s WHERE id = %s AND Owner = %s",
                 ('Test Pre Pub', 'Test Post Pub', 'Rob', 1, 'Rob'))
 
-    @pytest.mark.unit_test
-    def test_fetch_phenotype(self):
-        """Test that a single phenotype is fetched properly
-
-        """
-        db_mock = mock.MagicMock()
-        with db_mock.cursor() as cursor:
-            test_data = (
-                35, "Test pre-publication", "Test post-publication",
-                "Original description A", "cm^2", "pre-abbrev",
-                "post-abbrev", "LAB001", "R. W.", "R. W.", "R. W."
-            )
-            cursor.fetchone.return_value = test_data
-            phenotype = fetchone(db_mock,
-                                 "Phenotype",
-                                 where=Phenotype(id_=35, owner="Rob"))
-            self.assertEqual(phenotype.id_, 35)
-            self.assertEqual(phenotype.pre_pub_description,
-                             "Test pre-publication")
-            cursor.execute.assert_called_once_with(
-                "SELECT * FROM Phenotype WHERE id = %s AND Owner = %s",
-                (35, 'Rob'))
-
-    @pytest.mark.unit_test
-    def test_fetchall_metadataaudit(self):
-        """Test that multiple metadata_audit entries are fetched properly
-
-        """
-        db_mock = mock.MagicMock()
-        with db_mock.cursor() as cursor:
-            test_data = (
-                1, 35, "Rob", ('{"pages": '
-                               '{"old": "5099-5109", '
-                               '"new": "5099-5110"}, '
-                               '"month": {"old": "July", '
-                               '"new": "June"}, '
-                               '"year": {"old": "2001", '
-                               '"new": "2002"}}'),
-                "2021-06-04 09:01:05")
-            cursor.fetchall.return_value = (test_data,)
-            metadata = list(fetchall(db_mock,
-                                     "metadata_audit",
-                                     where=MetadataAudit(dataset_id=35,
-                                                         editor="Rob")))[0]
-            self.assertEqual(metadata.dataset_id, 35)
-            self.assertEqual(metadata.time_stamp,
-                             "2021-06-04 09:01:05")
-            cursor.execute.assert_called_once_with(
-                ("SELECT * FROM metadata_audit WHERE "
-                 "dataset_id = %s AND editor = %s"),
-                (35, 'Rob'))
-
-    @pytest.mark.unit_test
-    # pylint: disable=R0201
-    def test_probeset_called_with_right_columns(self):
-        """Given a columns argument, test that the correct sql query is
-        constructed"""
-        db_mock = mock.MagicMock()
-        with db_mock.cursor() as cursor:
-            cursor.fetchall.return_value = None
-            fetchone(db_mock,
-                     "ProbeSet",
-                     where=Probeset(name="1446112_at"),
-                     columns=["OMIM", "Probe_set_target_region"])
-            cursor.execute.assert_called_once_with(
-                "SELECT OMIM, Probe_set_target_region FROM ProbeSet WHERE "
-                "Name = %s",
-                ("1446112_at",))
-
     @pytest.mark.unit_test
     def test_diff_from_dict(self):
         """Test that a correct diff is generated"""
-- 
cgit v1.2.3