Task SW-415: Fixed Django ORM tests that failed due to enabled pagination and...

Task SW-415: Fixed Django ORM tests that failed due to enabled pagination and test env setup that is only required for functional API tests

SAS/LSMR/test/t_lsmrapp_scheduling_django.py

@@ -91,7 +91,7 @@ class TaskTemplateTest(rest_framework.test.APITransactionTestCase):
         response = client.get('/task_template/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
         for item in self.test_data_1.items():
-            self.assertIn(item, response.data[0].items())
+            self.assertIn(item, response.data['results'][0].items())
 
     def test_GET_TaskTemplate_view_returns_correct_entry(self):
 
@@ -167,7 +167,7 @@ class DataproductSpecificationTemplateTest(rest_framework.test.APITransactionTes
         response = client.get('/dataproduct_specification_template/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
         for item in self.test_data_1.items():
-            self.assertIn(item, response.data[0].items())
+            self.assertIn(item, response.data['results'][0].items())
 
     def test_GET_DataproductSpecificationTemplate_view_returns_correct_entry(self):
 
@@ -257,7 +257,7 @@ class TaskTest(rest_framework.test.APITransactionTestCase):
         # assert
         response = client.get('/task/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
-        assertDataWithUrls(self, response.data[0], self.test_data_1)
+        assertDataWithUrls(self, response.data['results'][0], self.test_data_1)
 
     def test_GET_Task_view_returns_correct_entry(self):
 
@@ -353,7 +353,7 @@ class DataproductTest(rest_framework.test.APITransactionTestCase):
         # assert
         response = client.get('/dataproduct/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
-        assertDataWithUrls(self, response.data[0], self.test_data_1)
+        assertDataWithUrls(self, response.data['results'][0], self.test_data_1)
 
     def test_GET_Dataproduct_view_returns_correct_entry(self):
 
@@ -439,7 +439,7 @@ class TaskIORoleTest(rest_framework.test.APITransactionTestCase):
         # assert
         response = client.get('/task_io_role/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
-        assertDataWithUrls(self, response.data[0], self.test_data_1)
+        assertDataWithUrls(self, response.data['results'][0], self.test_data_1)
 
     def test_GET_TaskIORole_view_returns_correct_entry(self):
         # setup
@@ -543,7 +543,7 @@ class DataproductRelationTest(rest_framework.test.APITransactionTestCase):
         # assert
         response = client.get('/dataproduct_relation/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
-        assertDataWithUrls(self, response.data[0], self.test_data_1)
+        assertDataWithUrls(self, response.data['results'][0], self.test_data_1)
 
     def test_GET_DataproductRelation_view_returns_correct_entry(self):
         # setup
@@ -634,7 +634,7 @@ class AntennaSetTest(rest_framework.test.APITransactionTestCase):
         # assert
         response = client.get('/antenna_set/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
-        assertDataWithUrls(self, response.data[0], self.test_data_1)
+        assertDataWithUrls(self, response.data['results'][0], self.test_data_1)
 
     def test_GET_AntennaSet_view_returns_correct_entry(self):
         # setup

SAS/LSMR/test/t_lsmrapp_scheduling_django.run

-#!/bin/bash
+#!/bin/sh
 
-. test_funcs.sh
-
-setup
-run_test "$LOFARROOT/lib*/python*/site-packages/lofar/sas/lsmr/manage.py test --pattern=\"t_lsmrapp_scheduling_django.py\" --testrunner=postgres_testrunner.PostgresqlTestRunner"
+$LOFARROOT/lib*/python*/site-packages/lofar/sas/lsmr/manage.py test --pattern="t_lsmrapp_scheduling_django.py" --testrunner=postgres_testrunner.PostgresqlTestRunner
 
 
 

SAS/LSMR/test/t_lsmrapp_specification_django.py

@@ -108,7 +108,7 @@ class GeneratorTemplateTest(rest_framework.test.APITransactionTestCase):
         response = client.get('/generator_template/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
         for item in self.test_data_1.items():
-            self.assertIn(item, response.data[0].items())
+            self.assertIn(item, response.data['results'][0].items())
 
     def test_GET_GeneratorTemplate_view_returns_correct_entry(self):
 
@@ -214,7 +214,7 @@ class RunTemplateTest(rest_framework.test.APITransactionTestCase):
         response = client.get('/run_template/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
         for item in self.test_data_1.items():
-            self.assertIn(item, response.data[0].items())
+            self.assertIn(item, response.data['results'][0].items())
 
     def test_GET_RunTemplate_view_returns_correct_entry(self):
 
@@ -293,7 +293,7 @@ class WorkRequestTemplateTest(rest_framework.test.APITransactionTestCase):
         response = client.get('/work_request_template/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
         for item in self.test_data_1.items():
-            self.assertIn(item, response.data[0].items())
+            self.assertIn(item, response.data['results'][0].items())
 
     def test_GET_WorkRequestTemplate_view_returns_correct_entry(self):
 
@@ -370,7 +370,7 @@ class WorkRelationSelectionTemplateTest(rest_framework.test.APITransactionTestCa
         response = client.get('/work_relation_selection_template/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
         for item in self.test_data_1.items():
-            self.assertIn(item, response.data[0].items())
+            self.assertIn(item, response.data['results'][0].items())
 
     def test_GET_WorkRelationSelectionTemplate_view_returns_correct_entry(self):
 
@@ -425,7 +425,7 @@ class WorkIORoleTest(rest_framework.test.APITransactionTestCase):
         # assert
         response = client.get('/work_io_role/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
-        assertDataWithUrls(self, response.data[0], self.test_data_1)
+        assertDataWithUrls(self, response.data['results'][0], self.test_data_1)
 
     def test_GET_WorkIORole_view_returns_correct_entry(self):
 
@@ -509,7 +509,7 @@ class CycleTest(rest_framework.test.APITransactionTestCase):
         response = client.get('/cycle/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
         for item in self.test_data_1.items():
-            self.assertIn(item, response.data[0].items())
+            self.assertIn(item, response.data['results'][0].items())
 
     def test_Cycle_gets_created_with_correct_creation_timestamp(self):
 
@@ -587,7 +587,7 @@ class ProjectTest(rest_framework.test.APITransactionTestCase):
         response = client.get('/project/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
         for item in self.test_data_1.items():
-            self.assertIn(item, response.data[0].items())
+            self.assertIn(item, response.data['results'][0].items())
 
     def test_Project_gets_created_with_correct_creation_timestamp(self):
 
@@ -665,7 +665,7 @@ class RunSetTest(rest_framework.test.APITransactionTestCase):
         # assert
         response = client.get('/run_set/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
-        assertDataWithUrls(self, response.data[0], self.test_data_1)
+        assertDataWithUrls(self, response.data['results'][0], self.test_data_1)
 
     def test_RunSet_gets_created_with_correct_creation_timestamp(self):
 
@@ -769,7 +769,7 @@ class RunDraftTest(rest_framework.test.APITransactionTestCase):
         response = client.get('/run_draft/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
 
-        assertDataWithUrls(self, response.data[0], self.test_data_1)
+        assertDataWithUrls(self, response.data['results'][0], self.test_data_1)
 
     def test_RunDraft_gets_created_with_correct_creation_timestamp(self):
 
@@ -876,7 +876,7 @@ class WorkRequestDraftTest(rest_framework.test.APITransactionTestCase):
         response = client.get('/work_request_draft/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
 
-        assertDataWithUrls(self, response.data[0], self.test_data_1)
+        assertDataWithUrls(self, response.data['results'][0], self.test_data_1)
 
     def test_WorkRequestDraft_gets_created_with_correct_creation_timestamp(self):
 
@@ -986,7 +986,7 @@ class WorkRequestRelationDraftTest(rest_framework.test.APITransactionTestCase):
         response = client.get('/work_request_relation_draft/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
 
-        assertDataWithUrls(self, response.data[0], self.test_data_1)
+        assertDataWithUrls(self, response.data['results'][0], self.test_data_1)
 
     def test_WorkRequestRelationDraft_gets_created_with_correct_creation_timestamp(self):
 
@@ -1100,7 +1100,7 @@ class RunBlueprintTest(rest_framework.test.APITransactionTestCase):
         response = client.get('/run_blueprint/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
 
-        assertDataWithUrls(self, response.data[0], self.test_data_1)
+        assertDataWithUrls(self, response.data['results'][0], self.test_data_1)
 
     def test_RunBlueprint_gets_created_with_correct_creation_timestamp(self):
 
@@ -1210,7 +1210,7 @@ class WorkRequestBlueprintTest(rest_framework.test.APITransactionTestCase):
         response = client.get('/work_request_blueprint/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
 
-        assertDataWithUrls(self, response.data[0], self.test_data_1)
+        assertDataWithUrls(self, response.data['results'][0], self.test_data_1)
 
     def test_WorkRequestBlueprint_gets_created_with_correct_creation_timestamp(self):
 
@@ -1333,7 +1333,7 @@ class WorkRequestRelationBlueprintTest(rest_framework.test.APITransactionTestCas
         response = client.get('/work_request_relation_blueprint/', format='json', follow=True)
         self.assertEqual(response.status_code, 200)
 
-        assertDataWithUrls(self, response.data[0], self.test_data_1)
+        assertDataWithUrls(self, response.data['results'][0], self.test_data_1)
 
     def test_WorkRequestRelationBlueprint_gets_created_with_correct_creation_timestamp(self):
         # setup

SAS/LSMR/test/t_lsmrapp_specification_django.run

-#!/bin/bash
+#!/bin/sh
 
-. test_funcs.sh
-
-setup
-run_test "$LOFARROOT/lib*/python*/site-packages/lofar/sas/lsmr/manage.py test --pattern=\"t_lsmrapp_specification_django.py\" --testrunner=postgres_testrunner.PostgresqlTestRunner"
+$LOFARROOT/lib*/python*/site-packages/lofar/sas/lsmr/manage.py test --pattern="t_lsmrapp_specification_django.py" --testrunner=postgres_testrunner.PostgresqlTestRunner