sebastian/timemanager
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases Wiki Activity

Pull-Request: Failing Test into tests #42

Merged
sebastian merged 14 commits from test-failing into tests 2023-11-11 11:19:32 +01:00
Conversation 0 Commits 14 Files Changed 3 +73 -145
2 changed files with 73 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e43f684b82 - Show all commits

158
backend/.idea/workspace.xml
View File

@ -32,7 +32,7 @@
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY"> <option name="RECENT_BRANCH_BY_REPOSITORY">
<map> <map>
<entry key="$PROJECT_DIR$/.." value="master" /> <entry key="$PROJECT_DIR$/.." value="test-failing" />
</map> </map>
</option> </option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
@ -93,69 +93,6 @@
</key> </key>
</component> </component>
<component name="RunManager" selected="JUnit.TaskgroupServiceTest"> <component name="RunManager" selected="JUnit.TaskgroupServiceTest">
<configuration name="TaskRepositoryTest.deleteByTaskID" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="demo" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="core.tasks.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="core.tasks" />
<option name="MAIN_CLASS_NAME" value="core.tasks.TaskRepositoryTest" />
<option name="METHOD_NAME" value="deleteByTaskID" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TaskServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="demo" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="core.tasks.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="core.tasks" />
<option name="MAIN_CLASS_NAME" value="core.tasks.TaskServiceTest" />
<option name="TEST_OBJECT" value="class" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TaskServiceTest.createTask" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="demo" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="core.tasks.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="core.tasks" />
<option name="MAIN_CLASS_NAME" value="core.tasks.TaskServiceTest" />
<option name="METHOD_NAME" value="createTask" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TaskServiceTest.deleteTask" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="demo" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="core.tasks.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="core.tasks" />
<option name="MAIN_CLASS_NAME" value="core.tasks.TaskServiceTest" />
<option name="METHOD_NAME" value="deleteTask" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TaskgroupServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true"> <configuration name="TaskgroupServiceTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="demo" /> <module name="demo" />
<extension name="coverage"> <extension name="coverage">
@ -171,6 +108,70 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="TaskgroupServiceTest.deleteTaskgroup" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="demo" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="core.taskgroups.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="core.taskgroups" />
<option name="MAIN_CLASS_NAME" value="core.taskgroups.TaskgroupServiceTest" />
<option name="METHOD_NAME" value="deleteTaskgroup" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TaskgroupServiceTest.deleteTaskgroupByUser" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="demo" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="core.taskgroups.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="core.taskgroups" />
<option name="MAIN_CLASS_NAME" value="core.taskgroups.TaskgroupServiceTest" />
<option name="METHOD_NAME" value="deleteTaskgroupByUser" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TaskgroupServiceTest.getTaskgroupByIDAndUsername" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="demo" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="core.taskgroups.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="core.taskgroups" />
<option name="MAIN_CLASS_NAME" value="core.taskgroups.TaskgroupServiceTest" />
<option name="METHOD_NAME" value="getTaskgroupByIDAndUsername" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TaskgroupServiceTest.getTopTaskgroupsByUser" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="demo" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="core.taskgroups.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="core.taskgroups" />
<option name="MAIN_CLASS_NAME" value="core.taskgroups.TaskgroupServiceTest" />
<option name="METHOD_NAME" value="getTopTaskgroupsByUser" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="DemoApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true"> <configuration name="DemoApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
<module name="demo" /> <module name="demo" />
<option name="SPRING_BOOT_MAIN_CLASS" value="core.DemoApplication" /> <option name="SPRING_BOOT_MAIN_CLASS" value="core.DemoApplication" />
@ -181,10 +182,10 @@
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="JUnit.TaskgroupServiceTest" /> <item itemvalue="JUnit.TaskgroupServiceTest" />
<item itemvalue="JUnit.TaskServiceTest" /> <item itemvalue="JUnit.TaskgroupServiceTest.getTaskgroupByIDAndUsername" />
<item itemvalue="JUnit.TaskServiceTest.createTask" /> <item itemvalue="JUnit.TaskgroupServiceTest.deleteTaskgroupByUser" />
<item itemvalue="JUnit.TaskServiceTest.deleteTask" /> <item itemvalue="JUnit.TaskgroupServiceTest.getTopTaskgroupsByUser" />
<item itemvalue="JUnit.TaskRepositoryTest.deleteByTaskID" /> <item itemvalue="JUnit.TaskgroupServiceTest.deleteTaskgroup" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@ -222,7 +223,7 @@
<workItem from="1699466564154" duration="6646000" /> <workItem from="1699466564154" duration="6646000" />
<workItem from="1699473376129" duration="1423000" /> <workItem from="1699473376129" duration="1423000" />
<workItem from="1699639316405" duration="9267000" /> <workItem from="1699639316405" duration="9267000" />
<workItem from="1699684493731" duration="7709000" /> <workItem from="1699684493731" duration="1121000" />
</task> </task>
<task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies"> <task id="LOCAL-00001" summary="Structure Taskgroups in Hierarchies">
<option name="closed" value="true" /> <option name="closed" value="true" />
@ -456,21 +457,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1699646291964</updated> <updated>1699646291964</updated>
</task> </task>
<task id="LOCAL-00030" summary="Testcases (and failing test fixes) of TaskgroupService"> <option name="localTasksCounter" value="30" />
<option name="closed" value="true" />
<created>1699685656297</created>
<option name="number" value="00030" />
<option name="presentableId" value="LOCAL-00030" />
<option name="project" value="LOCAL" />
<updated>1699685656297</updated>
</task>
<option name="localTasksCounter" value="31" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" /> <option name="version" value="3" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="Delete and clear Tasks (Frontend)" />
<MESSAGE value="Define Entity BasicTaskSchedule and Taskcontroller" /> <MESSAGE value="Define Entity BasicTaskSchedule and Taskcontroller" />
<MESSAGE value="Delete Schedules" /> <MESSAGE value="Delete Schedules" />
<MESSAGE value="Deliver Schedule Path Info when fetching Schedules" /> <MESSAGE value="Deliver Schedule Path Info when fetching Schedules" />
@ -495,8 +489,7 @@
<MESSAGE value="Test TaskRepository" /> <MESSAGE value="Test TaskRepository" />
<MESSAGE value="Initialize Testing of Testservice" /> <MESSAGE value="Initialize Testing of Testservice" />
<MESSAGE value="Use @Sql instead of persit()" /> <MESSAGE value="Use @Sql instead of persit()" />
<MESSAGE value="Testcases (and failing test fixes) of TaskgroupService" /> <option name="LAST_COMMIT_MESSAGE" value="Use @Sql instead of persit()" />
<option name="LAST_COMMIT_MESSAGE" value="Testcases (and failing test fixes) of TaskgroupService" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
@ -521,11 +514,6 @@
<line>57</line> <line>57</line>
<option name="timeStamp" value="12" /> <option name="timeStamp" value="12" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/test/java/core/tasks/TaskServiceTest.java</url>
<line>188</line>
<option name="timeStamp" value="23" />
</line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
</component> </component>

60
backend/src/test/java/core/tasks/TaskServiceTest.java
View File

@ -43,10 +43,7 @@ public class TaskServiceTest {
@Sql("classpath:taskgroupRepositoryTestEntries.sql"), @Sql("classpath:taskgroupRepositoryTestEntries.sql"),
@Sql("classpath:taskRepositoryEntries.sql") @Sql("classpath:taskRepositoryEntries.sql")
}) })
<<<<<<< HEAD
=======
@Rollback(value = true) @Rollback(value = true)
>>>>>>> 5e39cb1 (TaskService Test will fail)
void createTask() { void createTask() {
//Situation 1: Task with that name already exists in a taskgroup //Situation 1: Task with that name already exists in a taskgroup
TaskFieldInfo taskFieldInfo_1 = new TaskFieldInfo(entityManager.find(Task.class, 1L).getTaskName(), 0, null, null); TaskFieldInfo taskFieldInfo_1 = new TaskFieldInfo(entityManager.find(Task.class, 1L).getTaskName(), 0, null, null);
@ -122,132 +119,75 @@ public class TaskServiceTest {
assertEquals(ServiceExitCode.OK, result_1.getExitCode()); assertEquals(ServiceExitCode.OK, result_1.getExitCode());
assertEquals(task_1, result_1.getResult()); assertEquals(task_1, result_1.getResult());
<<<<<<< HEAD
//Situation 2: Name is updated to name that already exists within the taskgroup
Task task_2 = entityManager.find(Task.class, 1L);
TaskFieldInfo taskFieldInfo_2 = new TaskFieldInfo(entityManager.find(Task.class, 2L).getTaskName(), 0, null, null);
ServiceResult<Task> result_2 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_2);
task_2.setTaskName(entityManager.find(Task.class, 2L).getTaskName());
=======
//Situation 2: Name is updated to name that already exists within another taskgroup //Situation 2: Name is updated to name that already exists within another taskgroup
Task task_2 = entityManager.find(Task.class, 1L); Task task_2 = entityManager.find(Task.class, 1L);
task_2.setTaskName(entityManager.find(Task.class, 2L).getTaskName()); task_2.setTaskName(entityManager.find(Task.class, 2L).getTaskName());
TaskFieldInfo taskFieldInfo_2 = new TaskFieldInfo(entityManager.find(Task.class, 2L).getTaskName(), 0, null, null); TaskFieldInfo taskFieldInfo_2 = new TaskFieldInfo(entityManager.find(Task.class, 2L).getTaskName(), 0, null, null);
ServiceResult<Task> result_2 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_2); ServiceResult<Task> result_2 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_2);
>>>>>>> 5e39cb1 (TaskService Test will fail)
assertEquals(ServiceExitCode.ENTITY_ALREADY_EXIST, result_2.getExitCode()); assertEquals(ServiceExitCode.ENTITY_ALREADY_EXIST, result_2.getExitCode());
assertNotEquals(task_2, result_2.getResult()); assertNotEquals(task_2, result_2.getResult());
//Situation 3: Name is updated to nonexistend Name //Situation 3: Name is updated to nonexistend Name
Task task_3 = entityManager.find(Task.class, 1L); Task task_3 = entityManager.find(Task.class, 1L);
<<<<<<< HEAD
TaskFieldInfo taskFieldInfo_3 = new TaskFieldInfo("Situation 3", 0, null, null);
ServiceResult<Task> result_3 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_3);
task_3.setTaskName("Situation 3");
=======
task_3.setTaskName("Situation 3"); task_3.setTaskName("Situation 3");
TaskFieldInfo taskFieldInfo_3 = new TaskFieldInfo("Situation 3", 0, null, null); TaskFieldInfo taskFieldInfo_3 = new TaskFieldInfo("Situation 3", 0, null, null);
ServiceResult<Task> result_3 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_3); ServiceResult<Task> result_3 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_3);
>>>>>>> 5e39cb1 (TaskService Test will fail)
assertEquals(ServiceExitCode.OK, result_3.getExitCode()); assertEquals(ServiceExitCode.OK, result_3.getExitCode());
assertEquals(task_3, result_3.getResult()); assertEquals(task_3, result_3.getResult());
//Situation 4: eta is updated //Situation 4: eta is updated
Task task_4 = entityManager.find(Task.class, 1L); Task task_4 = entityManager.find(Task.class, 1L);
<<<<<<< HEAD
TaskFieldInfo taskFieldInfo_4 = new TaskFieldInfo(task_4.getTaskName(), 90, null, null);
ServiceResult<Task> result_4 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_4);
task_4.setEta(90);
=======
task_4.setEta(90); task_4.setEta(90);
TaskFieldInfo taskFieldInfo_4 = new TaskFieldInfo(task_4.getTaskName(), 90, null, null); TaskFieldInfo taskFieldInfo_4 = new TaskFieldInfo(task_4.getTaskName(), 90, null, null);
ServiceResult<Task> result_4 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_4); ServiceResult<Task> result_4 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_4);
>>>>>>> 5e39cb1 (TaskService Test will fail)
assertEquals(ServiceExitCode.OK, result_4.getExitCode()); assertEquals(ServiceExitCode.OK, result_4.getExitCode());
assertEquals(task_4, result_4.getResult()); assertEquals(task_4, result_4.getResult());
//Situation 5: deadline and start is updated in a valid way //Situation 5: deadline and start is updated in a valid way
Task task_5 = entityManager.find(Task.class, 1L); Task task_5 = entityManager.find(Task.class, 1L);
<<<<<<< HEAD
TaskFieldInfo taskFieldInfo_5 = new TaskFieldInfo(task_5.getTaskName(), task_5.getEta(), LocalDate.of(2023, 4, 9), LocalDate.of(2023,5,9));
ServiceResult<Task> result_5 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_5);
task_5.setStartDate(LocalDate.of(2023,4,9));
task_5.setDeadline(LocalDate.of(2023,5,9));
=======
task_5.setStartDate(LocalDate.of(2023,4,9)); task_5.setStartDate(LocalDate.of(2023,4,9));
task_5.setDeadline(LocalDate.of(2023,5,9)); task_5.setDeadline(LocalDate.of(2023,5,9));
TaskFieldInfo taskFieldInfo_5 = new TaskFieldInfo(task_5.getTaskName(), task_5.getEta(), LocalDate.of(2023, 4, 9), LocalDate.of(2023,5,9)); TaskFieldInfo taskFieldInfo_5 = new TaskFieldInfo(task_5.getTaskName(), task_5.getEta(), LocalDate.of(2023, 4, 9), LocalDate.of(2023,5,9));
ServiceResult<Task> result_5 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_5); ServiceResult<Task> result_5 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_5);
>>>>>>> 5e39cb1 (TaskService Test will fail)
assertEquals(ServiceExitCode.OK, result_5.getExitCode()); assertEquals(ServiceExitCode.OK, result_5.getExitCode());
assertEquals(task_5, result_5.getResult()); assertEquals(task_5, result_5.getResult());
//Situation 6: Deadline and start are updated in a not valid way //Situation 6: Deadline and start are updated in a not valid way
Task task_6 = entityManager.find(Task.class, 1L); Task task_6 = entityManager.find(Task.class, 1L);
<<<<<<< HEAD
TaskFieldInfo taskFieldInfo_6 = new TaskFieldInfo(task_5.getTaskName(), task_5.getEta(), LocalDate.of(2023, 5, 9), LocalDate.of(2023,4,9));
ServiceResult<Task> result_6 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_6);
task_6.setStartDate(LocalDate.of(2023,5,9));
task_6.setDeadline(LocalDate.of(2023,4,9));
=======
task_6.setStartDate(LocalDate.of(2023,5,9)); task_6.setStartDate(LocalDate.of(2023,5,9));
task_6.setDeadline(LocalDate.of(2023,4,9)); task_6.setDeadline(LocalDate.of(2023,4,9));
TaskFieldInfo taskFieldInfo_6 = new TaskFieldInfo(task_5.getTaskName(), task_5.getEta(), LocalDate.of(2023, 5, 9), LocalDate.of(2023,4,9)); TaskFieldInfo taskFieldInfo_6 = new TaskFieldInfo(task_5.getTaskName(), task_5.getEta(), LocalDate.of(2023, 5, 9), LocalDate.of(2023,4,9));
ServiceResult<Task> result_6 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_6); ServiceResult<Task> result_6 = taskService.editTask(entityManager.find(Task.class, 1L), taskFieldInfo_6);
>>>>>>> 5e39cb1 (TaskService Test will fail)
assertEquals(ServiceExitCode.INVALID_PARAMETER, result_6.getExitCode()); assertEquals(ServiceExitCode.INVALID_PARAMETER, result_6.getExitCode());
assertNotEquals(task_6, result_6.getResult()); assertNotEquals(task_6, result_6.getResult());
//Situation 10 Startdate = null; //Situation 10 Startdate = null;
Task task_10 = entityManager.find(Task.class, 5L); Task task_10 = entityManager.find(Task.class, 5L);
<<<<<<< HEAD
TaskFieldInfo taskFieldInfo_10 = new TaskFieldInfo(task_10.getTaskName(), task_10.getEta(),null, task_10.getDeadline());
ServiceResult<Task> result_10 = taskService.editTask(entityManager.find(Task.class, 5L), taskFieldInfo_10);
task_10.setStartDate(null);
=======
task_10.setStartDate(null); task_10.setStartDate(null);
TaskFieldInfo taskFieldInfo_10 = new TaskFieldInfo(task_10.getTaskName(), task_10.getEta(),null, task_10.getDeadline()); TaskFieldInfo taskFieldInfo_10 = new TaskFieldInfo(task_10.getTaskName(), task_10.getEta(),null, task_10.getDeadline());
ServiceResult<Task> result_10 = taskService.editTask(entityManager.find(Task.class, 5L), taskFieldInfo_10); ServiceResult<Task> result_10 = taskService.editTask(entityManager.find(Task.class, 5L), taskFieldInfo_10);
>>>>>>> 5e39cb1 (TaskService Test will fail)
assertEquals(ServiceExitCode.OK, result_10.getExitCode()); assertEquals(ServiceExitCode.OK, result_10.getExitCode());
assertEquals(task_10, result_10.getResult()); assertEquals(task_10, result_10.getResult());
//Situation 11 Deadline = null //Situation 11 Deadline = null
Task task_11 = entityManager.find(Task.class, 5L); Task task_11 = entityManager.find(Task.class, 5L);
<<<<<<< HEAD
TaskFieldInfo taskFieldInfo_11 = new TaskFieldInfo(task_11.getTaskName(), task_11.getEta(),task_11.getStartDate(), null);
ServiceResult<Task> result_11 = taskService.editTask(entityManager.find(Task.class, 5L), taskFieldInfo_11);
task_11.setDeadline(null);
assertEquals(ServiceExitCode.OK, result_11.getExitCode());
assertEquals(task_11, result_11.getResult());
}
=======
task_11.setDeadline(null); task_11.setDeadline(null);
TaskFieldInfo taskFieldInfo_11 = new TaskFieldInfo(task_11.getTaskName(), task_11.getEta(),task_11.getStartDate(), null); TaskFieldInfo taskFieldInfo_11 = new TaskFieldInfo(task_11.getTaskName(), task_11.getEta(),task_11.getStartDate(), null);
ServiceResult<Task> result_11 = taskService.editTask(entityManager.find(Task.class, 5L), taskFieldInfo_11); ServiceResult<Task> result_11 = taskService.editTask(entityManager.find(Task.class, 5L), taskFieldInfo_11);
assertEquals(ServiceExitCode.OK, result_11.getExitCode()); assertEquals(ServiceExitCode.OK, result_11.getExitCode());
assertEquals(task_11, result_11.getResult()); assertEquals(task_11, result_11.getResult());
} }
>>>>>>> 5e39cb1 (TaskService Test will fail)
@Test @Test
@SqlGroup({ @SqlGroup({
@Sql("classpath:taskgroupRepositoryTestEntries.sql"), @Sql("classpath:taskgroupRepositoryTestEntries.sql"),
@Sql("classpath:taskRepositoryEntries.sql") @Sql("classpath:taskRepositoryEntries.sql")
}) })
void deleteTask() { void deleteTask() {
<<<<<<< HEAD
for(long i=1; i<=15; i++) {
taskRepository.deleteByTaskID(entityManager.find(Task.class, i).getTaskID());
assertThat(entityManager.find(Task.class, i)).isNull();
}
=======
Task task = entityManager.find(Task.class, 1L); Task task = entityManager.find(Task.class, 1L);
task.getTaskgroup().getTasks().remove(task); task.getTaskgroup().getTasks().remove(task);
taskgroupRepository.save(task.getTaskgroup()); taskgroupRepository.save(task.getTaskgroup());
Task updatedTask = entityManager.find(Task.class, 1L); Task updatedTask = entityManager.find(Task.class, 1L);
taskRepository.deleteByTaskID(entityManager.find(Task.class, 1L).getTaskID()); taskRepository.deleteByTaskID(entityManager.find(Task.class, 1L).getTaskID());
assertThat(entityManager.find(Task.class, 1L)).isNull(); assertThat(entityManager.find(Task.class, 1L)).isNull();
>>>>>>> 5e39cb1 (TaskService Test will fail)
} }
} }