Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
b88b3f97
Commit
b88b3f97
authored
10 years ago
by
felmer
Browse files
Options
Downloads
Patches
Plain Diff
SSDM-802: making MicroscopyImageDropboxTest more robust
SVN: 32406
parent
f2e59b9e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/MicroscopyImageDropboxTest.java
+75
-8
75 additions, 8 deletions
...bis/screening/systemtests/MicroscopyImageDropboxTest.java
with
75 additions
and
8 deletions
screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/MicroscopyImageDropboxTest.java
+
75
−
8
View file @
b88b3f97
...
@@ -26,9 +26,13 @@ import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
...
@@ -26,9 +26,13 @@ import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetKind
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetKind
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityType
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentType
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentType
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewAttachment
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewAttachment
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.Project
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.Space
;
import
ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier
;
import
ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifierFactory
;
import
ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifierFactory
;
/**
/**
...
@@ -52,22 +56,23 @@ public class MicroscopyImageDropboxTest extends AbstractImageDropboxTestCase
...
@@ -52,22 +56,23 @@ public class MicroscopyImageDropboxTest extends AbstractImageDropboxTestCase
sessionToken
=
commonServer
.
tryAuthenticate
(
"admin"
,
"a"
).
getSessionToken
();
sessionToken
=
commonServer
.
tryAuthenticate
(
"admin"
,
"a"
).
getSessionToken
();
ExperimentType
experimentType
=
new
ExperimentType
();
ExperimentType
experimentType
=
new
ExperimentType
();
experimentType
.
setCode
(
"MICROSCOPY_EXPERIMENT"
);
experimentType
.
setCode
(
"MICROSCOPY_EXPERIMENT"
);
commonServer
.
registerExperimentType
(
sessionToken
,
experimentType
);
registerExperimentType
(
commonServer
,
experimentType
);
SampleType
sampleType
=
new
SampleType
();
SampleType
sampleType
=
new
SampleType
();
sampleType
.
setCode
(
"MICROSCOPY_SAMPLE"
);
sampleType
.
setCode
(
"MICROSCOPY_SAMPLE"
);
sampleType
.
setGeneratedCodePrefix
(
"M-"
);
sampleType
.
setGeneratedCodePrefix
(
"M-"
);
commonServer
.
registerSampleType
(
sessionToken
,
sampleType
);
registerSampleType
(
commonServer
,
sampleType
);
DataSetType
dataSetType
=
new
DataSetType
(
"MICROSCOPY_IMG"
);
DataSetType
dataSetType
=
new
DataSetType
(
"MICROSCOPY_IMG"
);
dataSetType
.
setDataSetKind
(
DataSetKind
.
PHYSICAL
);
dataSetType
.
setDataSetKind
(
DataSetKind
.
PHYSICAL
);
commonServer
.
registerDataSetType
(
sessionToken
,
dataSetType
);
registerDataSetType
(
commonServer
,
dataSetType
);
dataSetType
=
new
DataSetType
(
"MICROSCOPY_IMG_OVERVIEW"
);
dataSetType
.
setDataSetKind
(
DataSetKind
.
PHYSICAL
);
registerDataSetType
(
commonServer
,
dataSetType
);
dataSetType
=
new
DataSetType
(
"MICROSCOPY_IMG_CONTAINER"
);
dataSetType
=
new
DataSetType
(
"MICROSCOPY_IMG_CONTAINER"
);
dataSetType
.
setDataSetKind
(
DataSetKind
.
CONTAINER
);
dataSetType
.
setDataSetKind
(
DataSetKind
.
CONTAINER
);
commonServer
.
registerDataSetType
(
sessionToken
,
dataSetType
);
registerDataSetType
(
commonServer
,
dataSetType
);
commonServer
.
registerSpace
(
sessionToken
,
"TEST"
,
null
);
registerProject
(
commonServer
,
"/TEST/TEST-PROJECT"
);
commonServer
.
registerProject
(
sessionToken
,
ProjectIdentifierFactory
.
parse
(
"/TEST/TEST-PROJECT"
),
""
,
null
,
Collections
.<
NewAttachment
>
emptySet
());
}
}
@Override
@Override
protected
String
getDataFolderToDrop
()
protected
String
getDataFolderToDrop
()
{
{
...
@@ -104,5 +109,67 @@ public class MicroscopyImageDropboxTest extends AbstractImageDropboxTestCase
...
@@ -104,5 +109,67 @@ public class MicroscopyImageDropboxTest extends AbstractImageDropboxTestCase
.
channel
(
"SERIES-0_CHANNEL-1"
).
mode
(
"thumbnail512x512"
));
.
channel
(
"SERIES-0_CHANNEL-1"
).
mode
(
"thumbnail512x512"
));
imageChecker
.
assertNoFailures
();
imageChecker
.
assertNoFailures
();
}
}
private
void
registerProject
(
ICommonServer
server
,
String
identifier
)
{
for
(
Project
project
:
server
.
listProjects
(
sessionToken
))
{
if
(
project
.
getIdentifier
().
equals
(
identifier
))
{
return
;
}
}
ProjectIdentifier
projectIdentifier
=
ProjectIdentifierFactory
.
parse
(
identifier
);
registerSpace
(
server
,
projectIdentifier
.
getSpaceCode
());
server
.
registerProject
(
sessionToken
,
projectIdentifier
,
null
,
null
,
Collections
.<
NewAttachment
>
emptySet
());
}
private
void
registerSpace
(
ICommonServer
server
,
String
spaceCode
)
{
for
(
Space
space
:
server
.
listSpaces
(
sessionToken
))
{
if
(
space
.
getCode
().
equals
(
spaceCode
))
{
return
;
}
}
server
.
registerSpace
(
sessionToken
,
spaceCode
,
null
);
}
private
void
registerExperimentType
(
ICommonServer
server
,
ExperimentType
experimentType
)
{
for
(
EntityType
type
:
server
.
listExperimentTypes
(
sessionToken
))
{
if
(
type
.
getCode
().
equals
(
experimentType
.
getCode
()))
{
return
;
}
}
server
.
registerExperimentType
(
sessionToken
,
experimentType
);
}
private
void
registerSampleType
(
ICommonServer
server
,
SampleType
sampleType
)
{
for
(
EntityType
type
:
server
.
listSampleTypes
(
sessionToken
))
{
if
(
type
.
getCode
().
equals
(
sampleType
.
getCode
()))
{
return
;
}
}
server
.
registerSampleType
(
sessionToken
,
sampleType
);
}
private
void
registerDataSetType
(
ICommonServer
server
,
DataSetType
dataSetType
)
{
for
(
EntityType
type
:
server
.
listDataSetTypes
(
sessionToken
))
{
if
(
type
.
getCode
().
equals
(
dataSetType
.
getCode
()))
{
return
;
}
}
server
.
registerDataSetType
(
sessionToken
,
dataSetType
);
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment