remove magic numbers from tests

qiita_db/test/test_analysis.py

@@ -12,7 +12,7 @@
 from qiita_db.job import Job
 from qiita_db.user import User
 from qiita_db.exceptions import QiitaDBStatusError
-from qiita_db.util import get_mountpoint
+from qiita_db.util import get_mountpoint, get_count
 from qiita_db.study import Study, StudyPerson
 from qiita_db.data import ProcessedData
 from qiita_db.metadata_template import SampleTemplate
@@ -92,36 +92,36 @@ def test_has_access_no_access(self):
     def test_create(self):
         sql = "SELECT EXTRACT(EPOCH FROM NOW())"
         time1 = float(self.conn_handler.execute_fetchall(sql)[0][0])
-
+        new_id = get_count("qiita.analysis") + 1
         new = Analysis.create(User("admin@foo.bar"), "newAnalysis",
                               "A New Analysis")
-        self.assertEqual(new.id, 7)
+        self.assertEqual(new.id, new_id)
         sql = ("SELECT analysis_id, email, name, description, "
                "analysis_status_id, pmid, EXTRACT(EPOCH FROM timestamp) "
-               "FROM qiita.analysis WHERE analysis_id = 7")
-        obs = self.conn_handler.execute_fetchall(sql)
-        self.assertEqual(obs[0][:-1], [7, 'admin@foo.bar', 'newAnalysis',
+               "FROM qiita.analysis WHERE analysis_id = %s")
+        obs = self.conn_handler.execute_fetchall(sql, [new_id])
+        self.assertEqual(obs[0][:-1], [new_id, 'admin@foo.bar', 'newAnalysis',
                                        'A New Analysis', 1, None])
         self.assertTrue(time1 < float(obs[0][-1]))
 
     def test_create_parent(self):
         sql = "SELECT EXTRACT(EPOCH FROM NOW())"
         time1 = float(self.conn_handler.execute_fetchall(sql)[0][0])
-
+        new_id = get_count("qiita.analysis") + 1
         new = Analysis.create(User("admin@foo.bar"), "newAnalysis",
                               "A New Analysis", Analysis(1))
-        self.assertEqual(new.id, 7)
+        self.assertEqual(new.id, new_id)
         sql = ("SELECT analysis_id, email, name, description, "
                "analysis_status_id, pmid, EXTRACT(EPOCH FROM timestamp) "
-               "FROM qiita.analysis WHERE analysis_id = 7")
-        obs = self.conn_handler.execute_fetchall(sql)
-        self.assertEqual(obs[0][:-1], [7, 'admin@foo.bar', 'newAnalysis',
+               "FROM qiita.analysis WHERE analysis_id = %s")
+        obs = self.conn_handler.execute_fetchall(sql, [new_id])
+        self.assertEqual(obs[0][:-1], [new_id, 'admin@foo.bar', 'newAnalysis',
                                        'A New Analysis', 1, None])
         self.assertTrue(time1 < float(obs[0][-1]))
 
-        sql = "SELECT * FROM qiita.analysis_chain WHERE child_id = 7"
-        obs = self.conn_handler.execute_fetchall(sql)
-        self.assertEqual(obs, [[1, 7]])
+        sql = "SELECT * FROM qiita.analysis_chain WHERE child_id = %s"
+        obs = self.conn_handler.execute_fetchall(sql, [new_id])
+        self.assertEqual(obs, [[1, new_id]])
 
     def test_retrieve_owner(self):
         self.assertEqual(self.analysis.owner, "test@foo.bar")
@@ -242,21 +242,23 @@ def test_retrieve_biom_tables_none(self):
         self.assertEqual(new.biom_tables, None)
 
     def test_set_step(self):
+        new_id = get_count("qiita.analysis") + 1
         new = Analysis.create(User("admin@foo.bar"), "newAnalysis",
                               "A New Analysis", Analysis(1))
         new.step = 2
-        sql = "SELECT * FROM qiita.analysis_workflow WHERE analysis_id = 7"
-        obs = self.conn_handler.execute_fetchall(sql)
-        self.assertEqual(obs, [[7, 2]])
+        sql = "SELECT * FROM qiita.analysis_workflow WHERE analysis_id = %s"
+        obs = self.conn_handler.execute_fetchall(sql, [new_id])
+        self.assertEqual(obs, [[new_id, 2]])
 
     def test_set_step_twice(self):
+        new_id = get_count("qiita.analysis") + 1
         new = Analysis.create(User("admin@foo.bar"), "newAnalysis",
                               "A New Analysis", Analysis(1))
         new.step = 2
         new.step = 4
-        sql = "SELECT * FROM qiita.analysis_workflow WHERE analysis_id = 7"
-        obs = self.conn_handler.execute_fetchall(sql)
-        self.assertEqual(obs, [[7, 4]])
+        sql = "SELECT * FROM qiita.analysis_workflow WHERE analysis_id = %s"
+        obs = self.conn_handler.execute_fetchall(sql, [new_id])
+        self.assertEqual(obs, [[new_id, 4]])
 
     def test_retrieve_step(self):
         new = Analysis.create(User("admin@foo.bar"), "newAnalysis",

qiita_db/test/test_job.py

@@ -15,7 +15,7 @@
 from qiita_core.util import qiita_test_checker
 from qiita_db.job import Job, Command
 from qiita_db.user import User
-from qiita_db.util import get_mountpoint
+from qiita_db.util import get_mountpoint, get_count
 from qiita_db.analysis import Analysis
 from qiita_db.exceptions import (QiitaDBDuplicateError, QiitaDBStatusError,
                                  QiitaDBUnknownIDError)
@@ -219,16 +219,17 @@ def test_create_exists(self):
 
     def test_create_exists_return_existing(self):
         """Makes sure creation doesn't duplicate a job by returning existing"""
+        new_id = get_count("qiita.analysis") + 1
         Analysis.create(User("demo@microbio.me"), "new", "desc")
         self.conn_handler.execute(
             "INSERT INTO qiita.analysis_sample "
             "(analysis_id, processed_data_id, sample_id) VALUES "
-            "(7, 1, '1.SKB8.640193'), (7, 1, '1.SKD8.640184'), "
-            "(7, 1, '1.SKB7.640196'), (7, 1, '1.SKM9.640192'), "
-            "(7, 1, '1.SKM4.640180')")
+            "({0}, 1, '1.SKB8.640193'), ({0}, 1, '1.SKD8.640184'), "
+            "({0}, 1, '1.SKB7.640196'), ({0}, 1, '1.SKM9.640192'), "
+            "({0}, 1, '1.SKM4.640180')".format(new_id))
         new = Job.create("18S", "Beta Diversity",
                          {"--otu_table_fp": 1, "--mapping_fp": 1},
-                         Analysis(7), return_existing=True)
+                         Analysis(new_id), return_existing=True)
         self.assertEqual(new.id, 2)
 
     def test_retrieve_datatype(self):