diff --git a/SAS/TMSS/test/t_tmssapp_specification_REST_API.py b/SAS/TMSS/test/t_tmssapp_specification_REST_API.py index bc95e9ccebc694054c9bdc87772d8b5aab58e0bb..24d07e3af3072db6aa8de02a7211325751e57e0b 100755 --- a/SAS/TMSS/test/t_tmssapp_specification_REST_API.py +++ b/SAS/TMSS/test/t_tmssapp_specification_REST_API.py @@ -125,8 +125,8 @@ class GeneratorTemplateTestCase(unittest.TestCase): test_data_2 = GeneratorTemplate_test_data("test_generator_template_2") id1 = models.GeneratorTemplate.objects.create(**test_data_1).id id2 = models.GeneratorTemplate.objects.create(**test_data_2).id - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/generator_template/' + str(id1), test_data_1) - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/generator_template/' + str(id2), test_data_2) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/generator_template/' + str(id1) + '/', test_data_1) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/generator_template/' + str(id2) + '/', test_data_2) class SchedulingUnitTemplateTestCase(unittest.TestCase): @@ -197,8 +197,8 @@ class SchedulingUnitTemplateTestCase(unittest.TestCase): test_data_2 = SchedulingUnitTemplate_test_data("scheduling_unit_template_2") id1 = models.SchedulingUnitTemplate.objects.create(**test_data_1).id id2 = models.SchedulingUnitTemplate.objects.create(**test_data_2).id - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/scheduling_unit_template/' + str(id1), test_data_1) - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/scheduling_unit_template/' + str(id2), test_data_2) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/scheduling_unit_template/' + str(id1) + '/', test_data_1) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/scheduling_unit_template/' + str(id2) + '/', test_data_2) class TaskTemplateTestCase(unittest.TestCase): @@ -266,8 +266,8 @@ class TaskTemplateTestCase(unittest.TestCase): test_data_2 = TaskTemplate_test_data("task_template_2") id1 = models.TaskTemplate.objects.create(**test_data_1).id id2 = models.TaskTemplate.objects.create(**test_data_2).id - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/task_template/' + str(id1), test_data_1) - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/task_template/' + str(id2), test_data_2) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/task_template/' + str(id1) + '/', test_data_1) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/task_template/' + str(id2) + '/', test_data_2) class TaskRelationSelectionTemplateTestCase(unittest.TestCase): @@ -339,8 +339,8 @@ class TaskRelationSelectionTemplateTestCase(unittest.TestCase): test_data_2 = TaskRelationSelectionTemplate_test_data("task_relation_selection_template_2") id1 = models.TaskRelationSelectionTemplate.objects.create(**test_data_1).id id2 = models.TaskRelationSelectionTemplate.objects.create(**test_data_2).id - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/task_relation_selection_template/' + str(id1), test_data_1) - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/task_relation_selection_template/' + str(id2), test_data_2) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/task_relation_selection_template/' + str(id1) + '/', test_data_1) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/task_relation_selection_template/' + str(id2) + '/', test_data_2) class TaskConnectorTestCase(unittest.TestCase): @@ -491,8 +491,8 @@ class TaskConnectorTestCase(unittest.TestCase): test_data_2 = TaskConnectorType_test_data() id1 = models.TaskConnectorType.objects.create(**test_data_1).id id2 = models.TaskConnectorType.objects.create(**test_data_2).id - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/task_connector_type/' + str(id1), test_data_1) - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/task_connector_type/' + str(id2), test_data_2) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/task_connector_type/' + str(id1) + '/', test_data_1) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/task_connector_type/' + str(id2) + '/', test_data_2) class DefaultTemplates(unittest.TestCase): @@ -688,8 +688,8 @@ class CycleTestCase(unittest.TestCase): test_data_2 = Cycle_test_data() id1 = models.Cycle.objects.create(**test_data_1).name # name is pk id2 = models.Cycle.objects.create(**test_data_2).name # name is pk - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/cycle/' + str(id1), test_data_1) - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/cycle/' + str(id2), test_data_2) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/cycle/' + str(id1) + '/', test_data_1) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/cycle/' + str(id2) + '/', test_data_2) def test_cycle_contains_list_of_releated_projects(self): @@ -704,7 +704,7 @@ class CycleTestCase(unittest.TestCase): project2 = models.Project.objects.create(**project_test_data_2) project2.cycles.set([cycle]) project2.save() - response_data = GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/cycle/' + cycle.name, cycle_test_data_1) + response_data = GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/cycle/' + cycle.name + '/', cycle_test_data_1) assertUrlList(self, response_data['projects'], [project1, project2]) @@ -822,8 +822,8 @@ class ProjectTestCase(unittest.TestCase): test_data_2 = Project_test_data() id1 = models.Project.objects.create(**test_data_1).name # name is pk id2 = models.Project.objects.create(**test_data_2).name - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/project/' + str(id1), test_data_1) - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/project/' + str(id2), test_data_2) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/project/' + str(id1) + '/', test_data_1) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/project/' + str(id2) + '/', test_data_2) def test_nested_projects_are_filtered_according_to_cycle(self): @@ -1053,8 +1053,8 @@ class SchedulingSetTestCase(unittest.TestCase): test_data_2 = SchedulingSet_test_data() id1 = models.SchedulingSet.objects.create(**test_data_1).id id2 = models.SchedulingSet.objects.create(**test_data_2).id - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/scheduling_set/' + str(id1), test_data_1) - GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/scheduling_set/' + str(id2), test_data_2) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/scheduling_set/' + str(id1) + '/', test_data_1) + GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/scheduling_set/' + str(id2) + '/', test_data_2) def test_SchedulingSet_contains_list_of_releated_SchedulingUnitDraft(self): @@ -1066,7 +1066,7 @@ class SchedulingSetTestCase(unittest.TestCase): scheduling_unit_draft_2 = models.SchedulingUnitDraft.objects.create(**SchedulingUnitDraft_test_data("scheduler draft one")) scheduling_unit_draft_2.scheduling_set = scheduling_set scheduling_unit_draft_2.save() - response_data = GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/scheduling_set/%d' % scheduling_set.id, test_data_1) + response_data = GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/scheduling_set/%d/' % scheduling_set.id, test_data_1) assertUrlList(self, response_data['scheduling_unit_drafts'], [scheduling_unit_draft_1, scheduling_unit_draft_2])