Addressing remaining comments

Author: josenavas

qiita_db/test/test_meta_util.py

@@ -16,11 +16,11 @@
 
 @qiita_test_checker()
 class MetaUtilTests(TestCase):
-    def _set_studies_private(self):
+    def _set_processed_data_private(self):
         self.conn_handler.execute(
             "UPDATE qiita.processed_data SET processed_data_status_id=3")
 
-    def _set_studies_public(self):
+    def _set_processed_data_public(self):
         self.conn_handler.execute(
             "UPDATE qiita.processed_data SET processed_data_status_id=2")
 
@@ -31,7 +31,7 @@ def _unshare_analyses(self):
         self.conn_handler.execute("DELETE FROM qiita.analysis_users")
 
     def test_get_accessible_filepath_ids(self):
-        self._set_studies_private()
+        self._set_processed_data_private()
 
         # shared has access to all study files and analysis files
 
@@ -50,7 +50,7 @@ def test_get_accessible_filepath_ids(self):
         self.assertEqual(obs, set())
 
         # Now shared has access to public study files
-        self._set_studies_public()
+        self._set_processed_data_public()
         obs = get_accessible_filepath_ids(User('shared@foo.bar'))
         self.assertEqual(obs, set([1, 2, 5, 6, 7, 11, 16]))
 

qiita_db/test/test_study.py

@@ -170,7 +170,7 @@ def setUp(self):
             'lab_person_id': StudyPerson(1),
             'number_samples_collected': 27}
 
-    def _change_studies_status(self, new_status):
+    def _change_processed_data_status(self, new_status):
         # Change the status of the studies by changing the status of their
         # processed data
         id_status = convert_to_id(new_status, 'processed_data_status',
@@ -180,19 +180,19 @@ def _change_studies_status(self, new_status):
             (id_status,))
 
     def test_has_access_public(self):
-        self._change_studies_status('public')
+        self._change_processed_data_status('public')
         self.assertTrue(self.study.has_access(User("demo@microbio.me")))
 
     def test_has_access_no_public(self):
-        self._change_studies_status('public')
+        self._change_processed_data_status('public')
         self.assertFalse(self.study.has_access(User("demo@microbio.me"), True))
 
     def test_owner(self):
         self.assertEqual(self.study.owner, "test@foo.bar")
 
     def test_share(self):
         # Clear all sharing associations
-        self._change_studies_status('sandbox')
+        self._change_processed_data_status('sandbox')
         self.conn_handler.execute("delete from qiita.study_users")
         self.assertEqual(self.study.shared_with, [])
 
@@ -205,24 +205,24 @@ def test_share(self):
         self.assertEqual(self.study.shared_with, ["shared@foo.bar"])
 
     def test_unshare(self):
-        self._change_studies_status('sandbox')
+        self._change_processed_data_status('sandbox')
         self.study.unshare(User("shared@foo.bar"))
         self.assertEqual(self.study.shared_with, [])
 
     def test_has_access_shared(self):
-        self._change_studies_status('sandbox')
+        self._change_processed_data_status('sandbox')
         self.assertTrue(self.study.has_access(User("shared@foo.bar")))
 
     def test_has_access_private(self):
-        self._change_studies_status('sandbox')
+        self._change_processed_data_status('sandbox')
         self.assertTrue(self.study.has_access(User("test@foo.bar")))
 
     def test_has_access_admin(self):
-        self._change_studies_status('sandbox')
+        self._change_processed_data_status('sandbox')
         self.assertTrue(self.study.has_access(User("admin@foo.bar")))
 
     def test_has_access_no_access(self):
-        self._change_studies_status('sandbox')
+        self._change_processed_data_status('sandbox')
         self.assertFalse(self.study.has_access(User("demo@microbio.me")))
 
     def test_get_by_status(self):
@@ -506,7 +506,7 @@ def test_retrieve_raw_data_none(self):
         self.assertEqual(new.raw_data(), [])
 
     def test_add_raw_data(self):
-        self._change_studies_status('awaiting_approval')
+        self._change_processed_data_status('awaiting_approval')
         new = Study.create(User('test@foo.bar'), 'NOT Identification of the '
                            'Microbiomes for Cannabis Soils', [1], self.info)
         new.add_raw_data([RawData(1), RawData(2)])
@@ -536,7 +536,7 @@ def test_retrieve_processed_data_none(self):
         self.assertEqual(new.processed_data(), [])
 
     def test_add_pmid(self):
-        self._change_studies_status('sandbox')
+        self._change_processed_data_status('sandbox')
         self.study.add_pmid('4544444')
         exp = ['123456', '7891011', '4544444']
         self.assertEqual(self.study.pmids, exp)