enhance tests

mlcommons · Nov 19, 2023 · 8c5fe22 · 8c5fe22
1 parent ea39dc5
commit 8c5fe22
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 36 deletions.
diff --git a/server/benchmark/tests/test_.py b/server/benchmark/tests/test_.py
@@ -225,7 +225,6 @@ def setUp(self):
         self.set_credentials(self.actor)
 
     def test_generic_get_benchmark_list(self):
-        """Testing GET permissions"""
         # Arrange
         benchmark_id = self.testbenchmark["id"]
 
@@ -249,19 +248,36 @@ def setUp(self):
         benchmark = self.mock_benchmark(
             self.prep["id"], self.ref_model["id"], self.eval["id"]
         )
-        benchmark = self.create_benchmark(benchmark).data
         self.testbenchmark = benchmark
 
-    def test_unauthenticated_user(self):
-        """Testing unauthenticated user for both GET and POST"""
+    @parameterized.expand(
+        [
+            (None, status.HTTP_401_UNAUTHORIZED),
+        ]
+    )
+    def test_get_permissions(self, user, exp_status):
+        # Arrange
+        self.set_credentials(self.bmk_owner)
+        self.create_benchmark(self.testbenchmark)
+        self.set_credentials(user)
+
+        # Act
+        response = self.client.get(self.url)
 
+        # Assert
+        self.assertEqual(response.status_code, exp_status)
+
+    @parameterized.expand(
+        [
+            (None, status.HTTP_401_UNAUTHORIZED),
+        ]
+    )
+    def test_post_permissions(self, user, exp_status):
         # Arrange
-        self.set_credentials(None)
+        self.set_credentials(user)
 
         # Act
-        response1 = self.client.get(self.url)
-        response2 = self.client.post(self.url, {}, format="json")
+        response = self.client.post(self.url, self.testbenchmark, format="json")
 
         # Assert
-        self.assertEqual(response1.status_code, status.HTTP_401_UNAUTHORIZED)
-        self.assertEqual(response2.status_code, status.HTTP_401_UNAUTHORIZED)
+        self.assertEqual(response.status_code, exp_status)
diff --git a/server/benchmark/tests/test_pk_datasets.py b/server/benchmark/tests/test_pk_datasets.py
@@ -88,7 +88,6 @@ def setUp(self):
         self.set_credentials(self.actor)
 
     def test_generic_get_benchmark_datasets_list(self):
-        """Testing GET permissions"""
         # Arrange
         url = self.url.format(self.benchmark_id)
 

diff --git a/server/benchmark/tests/test_pk_models.py b/server/benchmark/tests/test_pk_models.py
@@ -93,7 +93,6 @@ def setUp(self):
         self.set_credentials(self.actor)
 
     def test_generic_get_benchmark_models_list(self):
-        """Testing GET permissions"""
         # Arrange
         url = self.url.format(self.benchmark_id)
 

diff --git a/server/dataset/tests/test_.py b/server/dataset/tests/test_.py
@@ -166,7 +166,6 @@ def setUp(self):
         self.set_credentials(self.actor)
 
     def test_generic_get_dataset_list(self):
-        """Testing GET permissions"""
         # Arrange
         dataset_id = self.testdataset["id"]
 
@@ -190,19 +189,36 @@ def setUp(self):
         testdataset = self.mock_dataset(
             data_preparation_mlcube=self.data_preproc_mlcube_id
         )
-        testdataset = self.create_dataset(testdataset).data
         self.testdataset = testdataset
 
-    def test_unauthenticated_user(self):
-        """Testing unauthenticated user for both GET and POST"""
+    @parameterized.expand(
+        [
+            (None, status.HTTP_401_UNAUTHORIZED),
+        ]
+    )
+    def test_get_permissions(self, user, exp_status):
+        # Arrange
+        self.set_credentials(self.data_owner)
+        self.create_dataset(self.testdataset)
+        self.set_credentials(user)
+
+        # Act
+        response = self.client.get(self.url)
 
+        # Assert
+        self.assertEqual(response.status_code, exp_status)
+
+    @parameterized.expand(
+        [
+            (None, status.HTTP_401_UNAUTHORIZED),
+        ]
+    )
+    def test_post_permissions(self, user, exp_status):
         # Arrange
-        self.set_credentials(None)
+        self.set_credentials(user)
 
         # Act
-        response1 = self.client.get(self.url)
-        response2 = self.client.post(self.url, {}, format="json")
+        response = self.client.post(self.url, self.testdataset, format="json")
 
         # Assert
-        self.assertEqual(response1.status_code, status.HTTP_401_UNAUTHORIZED)
-        self.assertEqual(response2.status_code, status.HTTP_401_UNAUTHORIZED)
+        self.assertEqual(response.status_code, exp_status)
diff --git a/server/dataset/tests/test_benchmarks.py b/server/dataset/tests/test_benchmarks.py
@@ -386,13 +386,12 @@ def setUp(self):
         ]
     )
     def test_post_permissions(self, user, exp_status):
-        """Testing unauthenticated user"""
-
         # Arrange
         self.set_credentials(user)
+        assoc = self.mock_mlcube_association(self.bmk_id, self.dataset_id)
 
         # Act
-        response = self.client.post(self.url, {}, format="json")
+        response = self.client.post(self.url, assoc, format="json")
 
         # Assert
         self.assertEqual(response.status_code, exp_status)
diff --git a/server/mlcube/tests/test_.py b/server/mlcube/tests/test_.py
@@ -287,7 +287,6 @@ def setUp(self):
         self.set_credentials(self.actor)
 
     def test_generic_get_mlcube_list(self):
-        """Testing GET permissions"""
         # Arrange
         mlcube_id = self.testmlcube["id"]
 
@@ -309,18 +308,36 @@ def setUp(self):
         self.generic_setup()
         self.set_credentials(self.mlcube_owner)
         testmlcube = self.mock_mlcube()
-        testmlcube = self.create_mlcube(testmlcube).data
+        self.testmlcube = testmlcube
+
+    @parameterized.expand(
+        [
+            (None, status.HTTP_401_UNAUTHORIZED),
+        ]
+    )
+    def test_get_permissions(self, user, exp_status):
+        # Arrange
+        self.set_credentials(self.mlcube_owner)
+        self.create_mlcube(self.testmlcube)
+        self.set_credentials(user)
+
+        # Act
+        response = self.client.get(self.url)
 
-    def test_unauthenticated_user(self):
-        """Testing unauthenticated user for both GET and POST"""
+        # Assert
+        self.assertEqual(response.status_code, exp_status)
 
+    @parameterized.expand(
+        [
+            (None, status.HTTP_401_UNAUTHORIZED),
+        ]
+    )
+    def test_post_permissions(self, user, exp_status):
         # Arrange
-        self.set_credentials(None)
+        self.set_credentials(user)
 
         # Act
-        response1 = self.client.get(self.url)
-        response2 = self.client.post(self.url, {}, format="json")
+        response = self.client.post(self.url, self.testmlcube, format="json")
 
         # Assert
-        self.assertEqual(response1.status_code, status.HTTP_401_UNAUTHORIZED)
-        self.assertEqual(response2.status_code, status.HTTP_401_UNAUTHORIZED)
+        self.assertEqual(response.status_code, exp_status)
diff --git a/server/mlcube/tests/test_benchmarks.py b/server/mlcube/tests/test_benchmarks.py
@@ -372,13 +372,12 @@ def setUp(self):
         ]
     )
     def test_post_permissions(self, user, exp_status):
-        """Testing unauthenticated user"""
-
         # Arrange
         self.set_credentials(user)
+        assoc = self.mock_mlcube_association(self.bmk_id, self.mlcube_id)
 
         # Act
-        response = self.client.post(self.url, {}, format="json")
+        response = self.client.post(self.url, assoc, format="json")
 
         # Assert
         self.assertEqual(response.status_code, exp_status)
diff --git a/server/test-requirements.txt b/server/test-requirements.txt
@@ -1,3 +1,4 @@
 requests
 curlify
-parameterized==0.9.0
+parameterized==0.9.0
+tblib==3.0.0  # to display tracebacks during parallel testing in Django