Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
VOSpace INAF
vospace-rest
Commits
e302b098
Commit
e302b098
authored
Aug 09, 2021
by
Sonia Zorba
Browse files
Added test on JobService
parent
5d8899dc
Pipeline
#2209
passed with stages
in 2 minutes and 21 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/it/inaf/oats/vospace/JobService.java
View file @
e302b098
...
...
@@ -203,7 +203,7 @@ public class JobService {
List
<
String
>
sourceAndDestination
=
copyService
.
processCopyNodes
(
transfer
,
jobId
,
user
);
// Call file service and command copy
try
{
fileServiceClient
.
startFileCopyJob
(
sourceAndDestination
.
get
(
0
),
sourceAndDestination
.
get
(
1
),
jobId
,
user
);
fileServiceClient
.
startFileCopyJob
(
sourceAndDestination
.
get
(
0
),
sourceAndDestination
.
get
(
1
),
jobId
,
user
);
}
catch
(
Exception
e
)
{
// We decided not to purge metadata in case of failure
// just release busy nodes setting job_id = null
...
...
src/test/java/it/inaf/oats/vospace/JobServiceTest.java
View file @
e302b098
...
...
@@ -55,6 +55,12 @@ public class JobServiceTest {
@Mock
private
MoveService
moveService
;
@Mock
private
CopyService
copyService
;
@Mock
private
FileServiceClient
fileServiceClient
;
@InjectMocks
private
JobService
jobService
;
...
...
@@ -217,6 +223,43 @@ public class JobServiceTest {
assertEquals
(
ExecutionPhase
.
COMPLETED
,
phases
.
get
(
2
));
}
@Test
public
void
testStartJobCopyNode
()
{
Transfer
copyNode
=
new
Transfer
();
copyNode
.
setDirection
(
"vos://example.com!vospace/myfile"
);
copyNode
.
setKeepBytes
(
true
);
JobSummary
job
=
new
JobSummary
();
setJobInfo
(
job
,
copyNode
);
when
(
uriService
.
getTransfer
(
any
())).
thenReturn
(
copyNode
);
List
<
ExecutionPhase
>
phases
=
new
ArrayList
<>();
doAnswer
(
invocation
->
{
JobSummary
j
=
invocation
.
getArgument
(
0
);
phases
.
add
(
j
.
getPhase
());
return
null
;
}).
when
(
jobDAO
).
updateJob
(
any
(),
any
());
when
(
copyService
.
processCopyNodes
(
any
(),
any
(),
any
())).
thenReturn
(
List
.
of
(
"source"
,
"dest"
));
jobService
.
setJobPhase
(
job
,
"RUN"
);
verify
(
fileServiceClient
,
timeout
(
1000
).
times
(
1
)).
startFileCopyJob
(
eq
(
"source"
),
eq
(
"dest"
),
any
(),
any
());
verify
(
jobDAO
,
timeout
(
1000
).
times
(
3
)).
updateJob
(
any
(),
any
());
try
{
Thread
.
sleep
(
500
);
}
catch
(
InterruptedException
ex
)
{
}
assertEquals
(
ExecutionPhase
.
EXECUTING
,
phases
.
get
(
0
));
assertEquals
(
ExecutionPhase
.
EXECUTING
,
phases
.
get
(
1
));
assertEquals
(
ExecutionPhase
.
EXECUTING
,
phases
.
get
(
2
));
}
private
Transfer
getPullFromVoSpaceHttpTransfer
()
{
Transfer
transfer
=
new
Transfer
();
transfer
.
setTarget
(
"vos://example.com!vospace/myfile"
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment