diff --git a/SAS/TMSS/test/t_tmssapp_specification_django.py b/SAS/TMSS/test/t_tmssapp_specification_django.py
index d2ad434a62d2aa40e674ba41afe7a9f64886d7df..7221f426d5c3012332631e4c630785c0207f4552 100755
--- a/SAS/TMSS/test/t_tmssapp_specification_django.py
+++ b/SAS/TMSS/test/t_tmssapp_specification_django.py
@@ -48,21 +48,20 @@ from django.contrib.auth.models import User
# client = rest_framework.test.APIClient()
# from lofar.sas.tmss.test.test_utils import assertDataWithUrls, assertUrlList
+def GeneratorTemplate_test_data():
+ return {"name": "observation",
+ "description": 'My one observation',
+ "version": 'v0.314159265359',
+ "schema": {"mykey": "my value"},
+ "create_function": 'Funky',
+ "tags": ["TMSS", "TESTING"]}
-class GeneratorTemplateTest(unittest.TestCase):
- @staticmethod
- def get_test_data():
- return {"name": "observation",
- "description": 'My one observation',
- "version": 'v0.314159265359',
- "schema": {"mykey": "my value"},
- "create_function": 'Funky',
- "tags": ["TMSS", "TESTING"]}
+class GeneratorTemplateTest(unittest.TestCase):
def test_GeneratorTemplate_gets_created_with_correct_creation_timestamp(self):
# setup
before = datetime.utcnow()
- entry = models.GeneratorTemplate.objects.create(**GeneratorTemplateTest.get_test_data())
+ entry = models.GeneratorTemplate.objects.create(**GeneratorTemplate_test_data())
after = datetime.utcnow()
@@ -73,7 +72,7 @@ class GeneratorTemplateTest(unittest.TestCase):
def test_GeneratorTemplate_update_timestamp_gets_changed_correctly(self):
# setup
- entry = models.GeneratorTemplate.objects.create(**GeneratorTemplateTest.get_test_data())
+ entry = models.GeneratorTemplate.objects.create(**GeneratorTemplate_test_data())
before = datetime.utcnow()
entry.save()
after = datetime.utcnow()
@@ -112,22 +111,21 @@ class GeneratorTemplateTest(unittest.TestCase):
# self.assertIn(item, response2.data.items())
+def DefaultGeneratorTemplate_test_data():
+ return {'name': 'default',
+ 'template': None,
+ 'tags':[]}
-class DefaultGeneratorTemplateTest(unittest.TestCase):
- @staticmethod
- def get_test_data():
- return {'name': 'default',
- 'template': None,
- 'tags':[]}
+class DefaultGeneratorTemplateTest(unittest.TestCase):
def test_DefaultGeneratorTemplate_prevents_same_name(self):
- templ1 = models.GeneratorTemplate.objects.create(**GeneratorTemplateTest.get_test_data())
- templ2 = models.GeneratorTemplate.objects.create(**GeneratorTemplateTest.get_test_data())
+ templ1 = models.GeneratorTemplate.objects.create(**GeneratorTemplate_test_data())
+ templ2 = models.GeneratorTemplate.objects.create(**GeneratorTemplate_test_data())
# setup
- test_data_1 = dict(DefaultGeneratorTemplateTest.get_test_data())
- test_data_2 = dict(DefaultGeneratorTemplateTest.get_test_data())
+ test_data_1 = dict(DefaultGeneratorTemplate_test_data())
+ test_data_2 = dict(DefaultGeneratorTemplate_test_data())
test_data_1['template'] = templ1
test_data_2['template'] = templ2
@@ -138,20 +136,20 @@ class DefaultGeneratorTemplateTest(unittest.TestCase):
models.DefaultGeneratorTemplate.objects.create(**test_data_2)
-class SchedulingUnitTemplateTest(unittest.TestCase):
- @staticmethod
- def get_test_data():
- return {"name": "My SchedulingUnitTemplate",
- "description": 'My SchedulingUnitTemplate description',
- "version": 'v0.314159265359',
- "schema": {"mykey": "my value"},
- "tags": ["TMSS", "TESTING"]}
+def SchedulingUnitTemplate_test_data():
+ return {"name": "My SchedulingUnitTemplate",
+ "description": 'My SchedulingUnitTemplate description',
+ "version": 'v0.314159265359',
+ "schema": {"mykey": "my value"},
+ "tags": ["TMSS", "TESTING"]}
+
+class SchedulingUnitTemplateTest(unittest.TestCase):
def test_SchedulingUnitTemplate_gets_created_with_correct_creation_timestamp(self):
# setup
before = datetime.utcnow()
- entry = models.SchedulingUnitTemplate.objects.create(**SchedulingUnitTemplateTest.get_test_data())
+ entry = models.SchedulingUnitTemplate.objects.create(**SchedulingUnitTemplate_test_data())
after = datetime.utcnow()
@@ -162,7 +160,7 @@ class SchedulingUnitTemplateTest(unittest.TestCase):
def test_SchedulingUnitTemplate_update_timestamp_gets_changed_correctly(self):
# setup
- entry = models.SchedulingUnitTemplate.objects.create(**SchedulingUnitTemplateTest.get_test_data())
+ entry = models.SchedulingUnitTemplate.objects.create(**SchedulingUnitTemplate_test_data())
before = datetime.utcnow()
entry.save()
after = datetime.utcnow()
@@ -200,22 +198,20 @@ class SchedulingUnitTemplateTest(unittest.TestCase):
# for item in self.test_data_2.items():
# self.assertIn(item, response2.data.items())
+def TaskTemplate_test_data():
+ return {"validation_code_js":"",
+ "name": "my TaskTemplate",
+ "description": 'My TaskTemplate description',
+ "version": 'v0.314159265359',
+ "schema": {"mykey": "my value"},
+ "tags": ["TMSS", "TESTING"]}
class TaskTemplateTest(unittest.TestCase):
- @staticmethod
- def get_test_data():
- return {"validation_code_js":"",
- "name": "my TaskTemplate",
- "description": 'My TaskTemplate description',
- "version": 'v0.314159265359',
- "schema": {"mykey": "my value"},
- "tags": ["TMSS", "TESTING"]}
-
def test_TaskTemplate_gets_created_with_correct_creation_timestamp(self):
# setup
before = datetime.utcnow()
- entry = models.TaskTemplate.objects.create(**TaskTemplateTest.get_test_data())
+ entry = models.TaskTemplate.objects.create(**TaskTemplate_test_data())
after = datetime.utcnow()
@@ -226,7 +222,7 @@ class TaskTemplateTest(unittest.TestCase):
def test_TaskTemplate_update_timestamp_gets_changed_correctly(self):
# setup
- entry = models.TaskTemplate.objects.create(**TaskTemplateTest.get_test_data())
+ entry = models.TaskTemplate.objects.create(**TaskTemplate_test_data())
before = datetime.utcnow()
entry.save()
after = datetime.utcnow()
@@ -265,22 +261,19 @@ class TaskTemplateTest(unittest.TestCase):
# self.assertIn(item, response2.data.items())
+def WorkRelationSelectionTemplate_test_data():
+ return {"name": "my WorkRelationSelectionTemplate",
+ "description": 'My WorkRelationSelectionTemplate description',
+ "version": 'v0.314159265359',
+ "schema": {"mykey": "my value"},
+ "tags": ["TMSS", "TESTING"]}
class WorkRelationSelectionTemplateTest(unittest.TestCase):
-
- @staticmethod
- def get_test_data():
- return {"name": "my WorkRelationSelectionTemplate",
- "description": 'My WorkRelationSelectionTemplate description',
- "version": 'v0.314159265359',
- "schema": {"mykey": "my value"},
- "tags": ["TMSS", "TESTING"]}
-
def test_WorkRelationSelectionTemplate_gets_created_with_correct_creation_timestamp(self):
# setup
before = datetime.utcnow()
- entry = models.WorkRelationSelectionTemplate.objects.create(**self.get_test_data())
+ entry = models.WorkRelationSelectionTemplate.objects.create(**WorkRelationSelectionTemplate_test_data())
after = datetime.utcnow()
@@ -291,7 +284,7 @@ class WorkRelationSelectionTemplateTest(unittest.TestCase):
def test_WorkRelationSelectionTemplate_update_timestamp_gets_changed_correctly(self):
# setup
- entry = models.WorkRelationSelectionTemplate.objects.create(**self.get_test_data())
+ entry = models.WorkRelationSelectionTemplate.objects.create(**WorkRelationSelectionTemplate_test_data())
before = datetime.utcnow()
entry.save()
after = datetime.utcnow()
@@ -330,16 +323,14 @@ class WorkRelationSelectionTemplateTest(unittest.TestCase):
# self.assertIn(item, response2.data.items())
-class TaskConnectorsTest(unittest.TestCase):
-
- @staticmethod
- def get_test_data():
- return {"role": models.Role.objects.get(value='calibrator'),
- "datatype": models.Datatype.objects.get(value='instrument model'),
- "output_of": models.TaskTemplate.objects.create(**TaskTemplateTest.get_test_data()),
- "input_of": models.TaskTemplate.objects.create(**TaskTemplateTest.get_test_data()),
- "tags": []}
+def TaskConnectors_test_data():
+ return {"role": models.Role.objects.get(value='calibrator'),
+ "datatype": models.Datatype.objects.get(value='instrument model'),
+ "output_of": models.TaskTemplate.objects.create(**TaskTemplate_test_data()),
+ "input_of": models.TaskTemplate.objects.create(**TaskTemplate_test_data()),
+ "tags": []}
+class TaskConnectorsTest(unittest.TestCase):
# TODO: rest API testing should be moved out of this test module.
# def test_GET_TaskConnectors_list_view_shows_entry(self):
#
@@ -369,7 +360,7 @@ class TaskConnectorsTest(unittest.TestCase):
def test_POST_TaskConnectors_prevents_missing_input_of(self):
# setup
- test_data_1 = dict(self.get_test_data())
+ test_data_1 = dict(TaskConnectors_test_data())
test_data_1['input_of'] = None
# assert
@@ -379,7 +370,7 @@ class TaskConnectorsTest(unittest.TestCase):
def test_POST_TaskConnectors_prevents_missing_output_of(self):
# setup
- test_data_1 = dict(self.get_test_data())
+ test_data_1 = dict(TaskConnectors_test_data())
test_data_1['output_of'] = None
# assert
@@ -403,19 +394,18 @@ class TaskConnectorsTest(unittest.TestCase):
# assertDataWithUrls(self, response.data, self.test_data_2)
-class CycleTest(unittest.TestCase):
- @classmethod
- def get_test_data(cls):
- return {"name": 'my_cycle' + str(uuid.uuid4()),
- "description": "",
- "tags": [],
- "start": datetime.utcnow().isoformat(),
- "stop": datetime.utcnow().isoformat(),
- "number": 1,
- "standard_hours": 2,
- "expert_hours": 3,
- "filler_hours": 4}
+def Cycle_test_data():
+ return {"name": 'my_cycle' + str(uuid.uuid4()),
+ "description": "",
+ "tags": [],
+ "start": datetime.utcnow().isoformat(),
+ "stop": datetime.utcnow().isoformat(),
+ "number": 1,
+ "standard_hours": 2,
+ "expert_hours": 3,
+ "filler_hours": 4}
+class CycleTest(unittest.TestCase):
# TODO: rest API testing should be moved out of this test module.
# def test_GET_Cycle_list_view_shows_entry(self):
#
@@ -432,7 +422,7 @@ class CycleTest(unittest.TestCase):
# setup
before = datetime.utcnow()
- entry = models.Cycle.objects.create(**self.get_test_data())
+ entry = models.Cycle.objects.create(**Cycle_test_data())
after = datetime.utcnow()
@@ -443,7 +433,7 @@ class CycleTest(unittest.TestCase):
def test_Cycle_update_timestamp_gets_changed_correctly(self):
# setup
- entry = models.Cycle.objects.create(**self.get_test_data())
+ entry = models.Cycle.objects.create(**Cycle_test_data())
before = datetime.utcnow()
entry.save()
after = datetime.utcnow()
@@ -490,19 +480,18 @@ class CycleTest(unittest.TestCase):
-class ProjectTest(unittest.TestCase):
- @classmethod
- def get_test_data(cls):
- return { "cycle": models.Cycle.objects.create(**CycleTest.get_test_data()),
- "name": 'my_project_' + str(uuid.uuid4()),
- "description": 'my description ' + str(uuid.uuid4()),
- "tags": [],
- "priority": 1,
- "can_trigger": False,
- "private_data": True,
- "expert": True,
- "filler": False}
+def Project_test_data():
+ return { "cycle": models.Cycle.objects.create(**Cycle_test_data()),
+ "name": 'my_project_' + str(uuid.uuid4()),
+ "description": 'my description ' + str(uuid.uuid4()),
+ "tags": [],
+ "priority": 1,
+ "can_trigger": False,
+ "private_data": True,
+ "expert": True,
+ "filler": False}
+class ProjectTest(unittest.TestCase):
# TODO: rest API testing should be moved out of this test module.
# def test_GET_Project_list_view_shows_entry(self):
#
@@ -519,7 +508,7 @@ class ProjectTest(unittest.TestCase):
# setup
before = datetime.utcnow()
- entry = models.Project.objects.create(**ProjectTest.get_test_data())
+ entry = models.Project.objects.create(**Project_test_data())
after = datetime.utcnow()
@@ -530,7 +519,7 @@ class ProjectTest(unittest.TestCase):
def test_Project_update_timestamp_gets_changed_correctly(self):
# setup
- entry = models.Project.objects.create(**ProjectTest.get_test_data())
+ entry = models.Project.objects.create(**Project_test_data())
before = datetime.utcnow()
entry.save()
after = datetime.utcnow()
@@ -588,20 +577,17 @@ class ProjectTest(unittest.TestCase):
# self.assertEqual(response.status_code, 404)
-
-class SchedulingSetTest(unittest.TestCase):
-
- @staticmethod
- def get_test_data():
- return {"name": 'my_scheduling_set',
- "description": "",
- "tags": [],
- "generator_doc": "{}",
- "project": models.Project.objects.create(**ProjectTest.get_test_data()),
- "generator_template": models.GeneratorTemplate.objects.create(**GeneratorTemplateTest.get_test_data()),
- "generator_source": None}
+def SchedulingSet_test_data():
+ return {"name": 'my_scheduling_set',
+ "description": "",
+ "tags": [],
+ "generator_doc": "{}",
+ "project": models.Project.objects.create(**Project_test_data()),
+ "generator_template": models.GeneratorTemplate.objects.create(**GeneratorTemplate_test_data()),
+ "generator_source": None}
+class SchedulingSetTest(unittest.TestCase):
# TODO: rest API testing should be moved out of this test module.
# def test_GET_SchedulingSet_list_view_shows_entry(self):
#
@@ -617,7 +603,7 @@ class SchedulingSetTest(unittest.TestCase):
# setup
before = datetime.utcnow()
- entry = models.SchedulingSet.objects.create(**self.get_test_data())
+ entry = models.SchedulingSet.objects.create(**SchedulingSet_test_data())
after = datetime.utcnow()
@@ -628,7 +614,7 @@ class SchedulingSetTest(unittest.TestCase):
def test_SchedulingSet_update_timestamp_gets_changed_correctly(self):
# setup
- entry = models.SchedulingSet.objects.create(**self.get_test_data())
+ entry = models.SchedulingSet.objects.create(**SchedulingSet_test_data())
before = datetime.utcnow()
entry.save()
after = datetime.utcnow()
@@ -655,7 +641,7 @@ class SchedulingSetTest(unittest.TestCase):
def test_SchedulingSet_prevents_missing_project(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(SchedulingSet_test_data())
test_data['project'] = None
# assert
@@ -683,21 +669,18 @@ class SchedulingSetTest(unittest.TestCase):
# assertUrlList(self, response.data['scheduling_unit_drafts'], [scheduling_unit_draft_1, scheduling_unit_draft_2])
-class SchedulingUnitDraftTest(unittest.TestCase):
-
-
- @staticmethod
- def get_test_data():
- return {"name": 'my_scheduling_unit_draft',
- "description": "",
- "tags": [],
- "requirements_doc": "{}",
- "copy_reason": models.CopyReason.objects.get(value='template'),
- "generator_instance_doc": "para",
- "copies": None,
- "scheduling_set": models.SchedulingSet.objects.create(**SchedulingSetTest.get_test_data()),
- "requirements_template": models.SchedulingUnitTemplate.objects.create(**SchedulingUnitTemplateTest.get_test_data())}
+def SchedulingUnitDraft_test_data():
+ return {"name": 'my_scheduling_unit_draft',
+ "description": "",
+ "tags": [],
+ "requirements_doc": "{}",
+ "copy_reason": models.CopyReason.objects.get(value='template'),
+ "generator_instance_doc": "para",
+ "copies": None,
+ "scheduling_set": models.SchedulingSet.objects.create(**SchedulingSet_test_data()),
+ "requirements_template": models.SchedulingUnitTemplate.objects.create(**SchedulingUnitTemplate_test_data())}
+class SchedulingUnitDraftTest(unittest.TestCase):
# TODO: rest API testing should be moved out of this test module.
# def test_GET_SchedulingUnitDraft_list_view_shows_entry(self):
#
@@ -714,7 +697,7 @@ class SchedulingUnitDraftTest(unittest.TestCase):
# setup
before = datetime.utcnow()
- entry = models.SchedulingUnitDraft.objects.create(**self.get_test_data())
+ entry = models.SchedulingUnitDraft.objects.create(**SchedulingUnitDraft_test_data())
after = datetime.utcnow()
@@ -725,7 +708,7 @@ class SchedulingUnitDraftTest(unittest.TestCase):
def test_SchedulingUnitDraft_update_timestamp_gets_changed_correctly(self):
# setup
- entry = models.SchedulingUnitDraft.objects.create(**self.get_test_data())
+ entry = models.SchedulingUnitDraft.objects.create(**SchedulingUnitDraft_test_data())
before = datetime.utcnow()
entry.save()
after = datetime.utcnow()
@@ -752,7 +735,7 @@ class SchedulingUnitDraftTest(unittest.TestCase):
def test_SchedulingUnitDraft_prevents_missing_template(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(SchedulingUnitDraft_test_data())
test_data['requirements_template'] = None
# assert
@@ -762,7 +745,7 @@ class SchedulingUnitDraftTest(unittest.TestCase):
def test_SchedulingUnitDraft_prevents_missing_scheduling_set(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(SchedulingUnitDraft_test_data())
test_data['scheduling_set'] = None
# assert
@@ -839,19 +822,17 @@ class SchedulingUnitDraftTest(unittest.TestCase):
# assertUrlList(self, response.data['task_drafts'], [task_draft_1, task_draft_2])
-class TaskDraftTest(unittest.TestCase):
-
- @staticmethod
- def get_test_data():
- return {"name": 'my_task_draft',
- "description": "",
- "tags": [],
- "specifications_doc": "{}",
- "copy_reason": models.CopyReason.objects.get(value='template'),
- "copies": None,
- "scheduling_unit_draft": models.SchedulingUnitDraft.objects.create(**SchedulingUnitDraftTest.get_test_data()),
- "specifications_template": models.TaskTemplate.objects.create(**TaskTemplateTest.get_test_data())}
+def TaskDraft_test_data():
+ return {"name": 'my_task_draft',
+ "description": "",
+ "tags": [],
+ "specifications_doc": "{}",
+ "copy_reason": models.CopyReason.objects.get(value='template'),
+ "copies": None,
+ "scheduling_unit_draft": models.SchedulingUnitDraft.objects.create(**SchedulingUnitDraft_test_data()),
+ "specifications_template": models.TaskTemplate.objects.create(**TaskTemplate_test_data())}
+class TaskDraftTest(unittest.TestCase):
# TODO: rest API testing should be moved out of this test module.
# def test_GET_TaskDraft_list_view_shows_entry(self):
#
@@ -868,7 +849,7 @@ class TaskDraftTest(unittest.TestCase):
# setup
before = datetime.utcnow()
- entry = models.TaskDraft.objects.create(**self.get_test_data())
+ entry = models.TaskDraft.objects.create(**TaskDraft_test_data())
after = datetime.utcnow()
@@ -879,7 +860,7 @@ class TaskDraftTest(unittest.TestCase):
def test_TaskDraft_update_timestamp_gets_changed_correctly(self):
# setup
- entry = models.TaskDraft.objects.create(**self.get_test_data())
+ entry = models.TaskDraft.objects.create(**TaskDraft_test_data())
before = datetime.utcnow()
entry.save()
after = datetime.utcnow()
@@ -906,7 +887,7 @@ class TaskDraftTest(unittest.TestCase):
def test_TaskDraft_prevents_missing_template(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(TaskDraft_test_data())
test_data['specifications_template'] = None
# assert
@@ -916,7 +897,7 @@ class TaskDraftTest(unittest.TestCase):
def test_TaskDraft_prevents_missing_scheduling_unit_draft(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(TaskDraft_test_data())
test_data['scheduling_unit_draft'] = None
# assert
@@ -997,19 +978,17 @@ class TaskDraftTest(unittest.TestCase):
# assertUrlList(self, response.data['consumed_by'], [task_relation_draft_2])
-class TaskRelationDraftTest(unittest.TestCase):
-
- @staticmethod
- def get_test_data():
- return {"tags": [],
- "selection_doc": "{}",
- "dataformat": models.Dataformat.objects.get(value='Beamformed'),
- "producer": models.TaskDraft.objects.create(**TaskDraftTest.get_test_data()),
- "consumer": models.TaskDraft.objects.create(**TaskDraftTest.get_test_data()),
- "input": models.TaskConnectors.objects.create(**TaskConnectorsTest.get_test_data()),
- "output": models.TaskConnectors.objects.create(**TaskConnectorsTest.get_test_data()),
- "selection_template": models.WorkRelationSelectionTemplate.objects.create(**WorkRelationSelectionTemplateTest.get_test_data())}
+def TaskRelationDraft_test_data():
+ return {"tags": [],
+ "selection_doc": "{}",
+ "dataformat": models.Dataformat.objects.get(value='Beamformed'),
+ "producer": models.TaskDraft.objects.create(**TaskDraft_test_data()),
+ "consumer": models.TaskDraft.objects.create(**TaskDraft_test_data()),
+ "input": models.TaskConnectors.objects.create(**TaskConnectors_test_data()),
+ "output": models.TaskConnectors.objects.create(**TaskConnectors_test_data()),
+ "selection_template": models.WorkRelationSelectionTemplate.objects.create(**WorkRelationSelectionTemplate_test_data())}
+class TaskRelationDraftTest(unittest.TestCase):
# TODO: rest API testing should be moved out of this test module.
# def test_GET_TaskRelationDraft_list_view_shows_entry(self):
#
@@ -1026,7 +1005,7 @@ class TaskRelationDraftTest(unittest.TestCase):
# setup
before = datetime.utcnow()
- entry = models.TaskRelationDraft.objects.create(**self.get_test_data())
+ entry = models.TaskRelationDraft.objects.create(**TaskRelationDraft_test_data())
after = datetime.utcnow()
@@ -1037,7 +1016,7 @@ class TaskRelationDraftTest(unittest.TestCase):
def test_TaskRelationDraft_update_timestamp_gets_changed_correctly(self):
# setup
- entry = models.TaskRelationDraft.objects.create(**self.get_test_data())
+ entry = models.TaskRelationDraft.objects.create(**TaskRelationDraft_test_data())
before = datetime.utcnow()
entry.save()
after = datetime.utcnow()
@@ -1064,7 +1043,7 @@ class TaskRelationDraftTest(unittest.TestCase):
def test_TaskRelationDraft_prevents_missing_template(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(TaskRelationDraft_test_data())
test_data['selection_template'] = None
# assert
@@ -1074,7 +1053,7 @@ class TaskRelationDraftTest(unittest.TestCase):
def test_TaskRelationDraft_prevents_missing_consumer(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(TaskRelationDraft_test_data())
test_data['consumer'] = None
# assert
@@ -1084,7 +1063,7 @@ class TaskRelationDraftTest(unittest.TestCase):
def test_TaskRelationDraft_prevents_missing_producer(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(TaskRelationDraft_test_data())
test_data['producer'] = None
# assert
@@ -1126,35 +1105,33 @@ class TaskRelationDraftTest(unittest.TestCase):
# response = client.get('/task_draft/%s/task_relation_draft/%s/' % (task_draft_2.id, task_relation_draft_1.id), format='json', follow=True)
# self.assertEqual(response.status_code, 404)
-class SchedulingUnitBlueprintTest(unittest.TestCase):
-
- @staticmethod
- def get_test_data():
- return {"name": 'my_scheduling_unit_blueprint',
- "description": "",
- "tags": [],
- "requirements_doc": "{}",
- "do_cancel": False,
- "draft": models.SchedulingUnitDraft.objects.create(**SchedulingUnitDraftTest.get_test_data()),
- "requirements_template": models.SchedulingUnitTemplate.objects.create(**SchedulingUnitTemplateTest.get_test_data())}
+def SchedulingUnitBlueprint_test_data():
+ return {"name": 'my_scheduling_unit_blueprint',
+ "description": "",
+ "tags": [],
+ "requirements_doc": "{}",
+ "do_cancel": False,
+ "draft": models.SchedulingUnitDraft.objects.create(**SchedulingUnitDraft_test_data()),
+ "requirements_template": models.SchedulingUnitTemplate.objects.create(**SchedulingUnitTemplate_test_data())}
+class SchedulingUnitBlueprintTest(unittest.TestCase):
# TODO: rest API testing should be moved out of this test module.
# def test_GET_SchedulingUnitBlueprint_list_view_shows_entry(self):
#
# # setup
- # models.SchedulingUnitBlueprint.objects.create(**self.get_test_data())
+ # models.SchedulingUnitBlueprint.objects.create(**SchedulingUnitBlueprint_test_data())
#
# # assert
# response = client.get('/scheduling_unit_blueprint/', format='json', follow=True)
# self.assertEqual(response.status_code, 200)
#
- # assertDataWithUrls(self, response.data['results'][0], self.get_test_data())
+ # assertDataWithUrls(self, response.data['results'][0], SchedulingUnitBlueprint_test_data())
def test_SchedulingUnitBlueprint_gets_created_with_correct_creation_timestamp(self):
# setup
before = datetime.utcnow()
- entry = models.SchedulingUnitBlueprint.objects.create(**self.get_test_data())
+ entry = models.SchedulingUnitBlueprint.objects.create(**SchedulingUnitBlueprint_test_data())
after = datetime.utcnow()
@@ -1165,7 +1142,7 @@ class SchedulingUnitBlueprintTest(unittest.TestCase):
def test_SchedulingUnitBlueprint_update_timestamp_gets_changed_correctly(self):
# setup
- entry = models.SchedulingUnitBlueprint.objects.create(**self.get_test_data())
+ entry = models.SchedulingUnitBlueprint.objects.create(**SchedulingUnitBlueprint_test_data())
before = datetime.utcnow()
entry.save()
after = datetime.utcnow()
@@ -1178,8 +1155,8 @@ class SchedulingUnitBlueprintTest(unittest.TestCase):
# def test_GET_SchedulingUnitBlueprint_view_returns_correct_entry(self):
#
# # setup
- # id1 = models.SchedulingUnitBlueprint.objects.create(**self.get_test_data()).id
- # id2 = models.SchedulingUnitBlueprint.objects.create(**self.get_test_data()).id
+ # id1 = models.SchedulingUnitBlueprint.objects.create(**SchedulingUnitBlueprint_test_data()).id
+ # id2 = models.SchedulingUnitBlueprint.objects.create(**SchedulingUnitBlueprint_test_data()).id
#
# # assert
# response1 = client.get('/scheduling_unit_blueprint/%s/' % id1, format='json', follow=True)
@@ -1192,7 +1169,7 @@ class SchedulingUnitBlueprintTest(unittest.TestCase):
def test_SchedulingUnitBlueprint_prevents_missing_template(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(SchedulingUnitBlueprint_test_data())
test_data['requirements_template'] = None
# assert
@@ -1202,7 +1179,7 @@ class SchedulingUnitBlueprintTest(unittest.TestCase):
def test_SchedulingUnitBlueprint_prevents_missing_draft(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(SchedulingUnitBlueprint_test_data())
test_data['draft'] = None
# assert
@@ -1242,19 +1219,17 @@ class SchedulingUnitBlueprintTest(unittest.TestCase):
-class TaskBlueprintTest(unittest.TestCase):
-
- @staticmethod
- def get_test_data():
- return {"name": 'my_task_blueprint',
- "description": "",
- "tags": [],
- "specifications_doc": "{}",
- "do_cancel": False,
- "draft": models.TaskDraft.objects.create(**TaskDraftTest.get_test_data()),
- "specifications_template": models.TaskTemplate.objects.create(**TaskTemplateTest.get_test_data()),
- "scheduling_unit_blueprint": models.SchedulingUnitBlueprint.objects.create(**SchedulingUnitBlueprintTest.get_test_data())}
+def TaskBlueprint_test_data():
+ return {"name": 'my_task_blueprint',
+ "description": "",
+ "tags": [],
+ "specifications_doc": "{}",
+ "do_cancel": False,
+ "draft": models.TaskDraft.objects.create(**TaskDraft_test_data()),
+ "specifications_template": models.TaskTemplate.objects.create(**TaskTemplate_test_data()),
+ "scheduling_unit_blueprint": models.SchedulingUnitBlueprint.objects.create(**SchedulingUnitBlueprint_test_data())}
+class TaskBlueprintTest(unittest.TestCase):
# TODO: rest API testing should be moved out of this test module.
# def test_GET_TaskBlueprint_list_view_shows_entry(self):
#
@@ -1271,7 +1246,7 @@ class TaskBlueprintTest(unittest.TestCase):
# setup
before = datetime.utcnow()
- entry = models.TaskBlueprint.objects.create(**self.get_test_data())
+ entry = models.TaskBlueprint.objects.create(**TaskBlueprint_test_data())
after = datetime.utcnow()
@@ -1282,7 +1257,7 @@ class TaskBlueprintTest(unittest.TestCase):
def test_TaskBlueprint_update_timestamp_gets_changed_correctly(self):
# setup
- entry = models.TaskBlueprint.objects.create(**self.get_test_data())
+ entry = models.TaskBlueprint.objects.create(**TaskBlueprint_test_data())
before = datetime.utcnow()
entry.save()
after = datetime.utcnow()
@@ -1309,7 +1284,7 @@ class TaskBlueprintTest(unittest.TestCase):
def test_TaskBlueprint_prevents_missing_template(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(TaskBlueprint_test_data())
test_data['specifications_template'] = None
# assert
@@ -1319,7 +1294,7 @@ class TaskBlueprintTest(unittest.TestCase):
def test_TaskBlueprint_prevents_missing_draft(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(TaskBlueprint_test_data())
test_data['draft'] = None
# assert
@@ -1329,7 +1304,7 @@ class TaskBlueprintTest(unittest.TestCase):
def test_TaskBlueprint_prevents_missing_scheduling_unit_blueprint(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(TaskBlueprint_test_data())
test_data['scheduling_unit_blueprint'] = None
# assert
@@ -1409,22 +1384,18 @@ class TaskBlueprintTest(unittest.TestCase):
# assertUrlList(self, response.data['produced_by'], [task_relation_blueprint_1])
# assertUrlList(self, response.data['consumed_by'], [task_relation_blueprint_2])
+def TaskRelationBlueprint_test_data():
+ return { "tags": [],
+ "selection_doc": "{}",
+ "dataformat": models.Dataformat.objects.get(value='Beamformed'),
+ "input": models.TaskConnectors.objects.create(**TaskConnectors_test_data()),
+ "output": models.TaskConnectors.objects.create(**TaskConnectors_test_data()),
+ "draft": models.TaskRelationDraft.objects.create(**TaskRelationDraft_test_data()),
+ "selection_template": models.WorkRelationSelectionTemplate.objects.create(**WorkRelationSelectionTemplate_test_data()),
+ "producer": models.TaskBlueprint.objects.create(**TaskBlueprint_test_data()),
+ "consumer": models.TaskBlueprint.objects.create(**TaskBlueprint_test_data())}
class TaskRelationBlueprintTest(unittest.TestCase):
-
- @staticmethod
- def get_test_data():
- # test data
- return { "tags": [],
- "selection_doc": "{}",
- "dataformat": models.Dataformat.objects.get(value='Beamformed'),
- "input": models.TaskConnectors.objects.create(**TaskConnectorsTest.get_test_data()),
- "output": models.TaskConnectors.objects.create(**TaskConnectorsTest.get_test_data()),
- "draft": models.TaskRelationDraft.objects.create(**TaskRelationDraftTest.get_test_data()),
- "selection_template": models.WorkRelationSelectionTemplate.objects.create(**WorkRelationSelectionTemplateTest.get_test_data()),
- "producer": models.TaskBlueprint.objects.create(**TaskBlueprintTest.get_test_data()),
- "consumer": models.TaskBlueprint.objects.create(**TaskBlueprintTest.get_test_data())}
-
# TODO: rest API testing should be moved out of this test module.
# def test_GET_TaskRelationBlueprint_list_view_shows_entry(self):
# # setup
@@ -1439,7 +1410,7 @@ class TaskRelationBlueprintTest(unittest.TestCase):
def test_TaskRelationBlueprint_gets_created_with_correct_creation_timestamp(self):
# setup
before = datetime.utcnow()
- entry = models.TaskRelationBlueprint.objects.create(**self.get_test_data())
+ entry = models.TaskRelationBlueprint.objects.create(**TaskRelationBlueprint_test_data())
after = datetime.utcnow()
@@ -1449,7 +1420,7 @@ class TaskRelationBlueprintTest(unittest.TestCase):
def test_TaskRelationBlueprint_update_timestamp_gets_changed_correctly(self):
# setup
- entry = models.TaskRelationBlueprint.objects.create(**self.get_test_data())
+ entry = models.TaskRelationBlueprint.objects.create(**TaskRelationBlueprint_test_data())
before = datetime.utcnow()
entry.save()
after = datetime.utcnow()
@@ -1474,7 +1445,7 @@ class TaskRelationBlueprintTest(unittest.TestCase):
def test_TaskRelationBlueprint_prevents_missing_selection_template(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(TaskRelationBlueprint_test_data())
test_data['selection_template'] = None
# assert
@@ -1483,7 +1454,7 @@ class TaskRelationBlueprintTest(unittest.TestCase):
def test_TaskRelationBlueprint_prevents_missing_draft(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(TaskRelationBlueprint_test_data())
test_data['draft'] = None
# assert
@@ -1492,7 +1463,7 @@ class TaskRelationBlueprintTest(unittest.TestCase):
def test_TaskRelationBlueprint_prevents_missing_producer(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(TaskRelationBlueprint_test_data())
test_data['producer'] = None
# assert
@@ -1501,7 +1472,7 @@ class TaskRelationBlueprintTest(unittest.TestCase):
def test_TaskRelationBlueprint_prevents_missing_consumer(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(TaskRelationBlueprint_test_data())
test_data['consumer'] = None
# assert
@@ -1510,7 +1481,7 @@ class TaskRelationBlueprintTest(unittest.TestCase):
def test_TaskRelationBlueprint_prevents_missing_input(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(TaskRelationBlueprint_test_data())
test_data['input'] = None
# assert
@@ -1519,7 +1490,7 @@ class TaskRelationBlueprintTest(unittest.TestCase):
def test_TaskRelationBlueprint_prevents_missing_output(self):
# setup
- test_data = dict(self.get_test_data())
+ test_data = dict(TaskRelationBlueprint_test_data())
test_data['output'] = None
# assert