43
43
import org .kitodo .data .database .exceptions .DAOException ;
44
44
import org .kitodo .data .exceptions .DataException ;
45
45
import org .kitodo .production .services .ServiceManager ;
46
- import org .kitodo .production .services .data .ProcessService ;
47
46
import org .kitodo .production .services .data .TaskService ;
48
47
import org .kitodo .production .services .file .FileService ;
49
48
import org .kitodo .utils .ProcessTestUtils ;
@@ -61,6 +60,8 @@ public class WorkflowControllerServiceIT {
61
60
private static final TaskService taskService = ServiceManager .getTaskService ();
62
61
private static final WorkflowControllerService workflowService = new WorkflowControllerService ();
63
62
private static int workflowTestProcessId = -1 ;
63
+ private static int workflowTestProcessId2 = -1 ;
64
+ private static final String METADATA_TEST_FILENAME = "testMetadataForNonBlockingParallelTasksTest.xml" ;
64
65
65
66
@ Before
66
67
public void prepareDatabase () throws Exception {
@@ -69,6 +70,9 @@ public void prepareDatabase() throws Exception {
69
70
workflowTestProcessId = Math .toIntExact (ServiceManager .getProcessService ().count ());
70
71
ProcessTestUtils .copyTestFiles (workflowTestProcessId , "testmetaNewspaper.xml" );
71
72
SecurityTestUtils .addUserDataToSecurityContext (ServiceManager .getUserService ().getById (1 ), 1 );
73
+ Task task = ServiceManager .getTaskService ().getById (35 );
74
+ workflowTestProcessId2 = task .getProcess ().getId ();
75
+ ProcessTestUtils .copyTestMetadataFile (workflowTestProcessId2 , METADATA_TEST_FILENAME );
72
76
73
77
usersDirectory .mkdir ();
74
78
@@ -82,7 +86,8 @@ public void prepareDatabase() throws Exception {
82
86
83
87
@ After
84
88
public void cleanDatabase () throws Exception {
85
- ProcessService .deleteProcess (workflowTestProcessId );
89
+ ProcessTestUtils .removeTestProcess (workflowTestProcessId );
90
+ ProcessTestUtils .removeTestProcess (workflowTestProcessId2 );
86
91
MockDatabase .stopNode ();
87
92
MockDatabase .cleanDatabase ();
88
93
SecurityTestUtils .cleanSecurityContext ();
0 commit comments