diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
index 7105227aea78f1f168879481fc303680bd0299fc..80740fcb0ee1297063cbf0719c91d3cebe9c2331 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java
@@ -420,7 +420,7 @@ public class ETLServiceTest extends AbstractServerTestCase
public void testTryGetSampleWithExperimentForAnUnknownSample()
{
final SampleIdentifier sampleIdentifier =
- new SampleIdentifier(new DatabaseInstanceIdentifier("db"), "s1");
+ new SampleIdentifier(new DatabaseInstanceIdentifier("DB"), "S1");
prepareTryToLoadSample(sampleIdentifier, null);
Sample sample = createService().tryGetSampleWithExperiment(SESSION_TOKEN, sampleIdentifier);
@@ -433,7 +433,7 @@ public class ETLServiceTest extends AbstractServerTestCase
public void testTryGetSampleWithExperimentForSampleWithNoValidProcedure()
{
final SampleIdentifier sampleIdentifier =
- new SampleIdentifier(new DatabaseInstanceIdentifier("db"), "s1");
+ new SampleIdentifier(new DatabaseInstanceIdentifier("DB"), "S1");
SamplePE samplePE = createSample();
prepareTryToLoadSample(sampleIdentifier, samplePE);
@@ -450,7 +450,7 @@ public class ETLServiceTest extends AbstractServerTestCase
public void testGetSampleWithExperimentWithoutAttachment()
{
final SampleIdentifier sampleIdentifier =
- new SampleIdentifier(new DatabaseInstanceIdentifier("db"), "s1");
+ new SampleIdentifier(new DatabaseInstanceIdentifier("DB"), "S1");
final ExperimentPE experiment = createExperiment("TYPE", "EXP1", "G1");
SamplePE sample = createSampleWithExperiment(experiment);
prepareTryToLoadSample(sampleIdentifier, sample);
@@ -472,7 +472,7 @@ public class ETLServiceTest extends AbstractServerTestCase
{
one(sampleDAO).tryToFindByPermID("abc");
SamplePE sample = new SamplePE();
- sample.setCode("s42");
+ sample.setCode("S42");
will(returnValue(sample));
}
});
@@ -480,7 +480,7 @@ public class ETLServiceTest extends AbstractServerTestCase
SampleIdentifier identifier =
createService().tryToGetSampleIdentifier(SESSION_TOKEN, "abc");
- assertEquals("s42", identifier.toString());
+ assertEquals("S42", identifier.toString());
context.assertIsSatisfied();
}
@@ -515,7 +515,7 @@ public class ETLServiceTest extends AbstractServerTestCase
public void testTryToGetPropertiesOfTopSampleForAnUnknownSample()
{
final SampleIdentifier sampleIdentifier =
- new SampleIdentifier(new DatabaseInstanceIdentifier("db"), "s1");
+ new SampleIdentifier(new DatabaseInstanceIdentifier("DB"), "S1");
prepareLoadSample(sampleIdentifier, null);
IEntityProperty[] properties =
@@ -530,7 +530,7 @@ public class ETLServiceTest extends AbstractServerTestCase
public void testTryToGetPropertiesOfTopSampleForAToplessSample()
{
final SampleIdentifier sampleIdentifier =
- new SampleIdentifier(new DatabaseInstanceIdentifier("db"), "s1");
+ new SampleIdentifier(new DatabaseInstanceIdentifier("DB"), "S1");
SamplePE toplessSample = new SamplePE();
SamplePropertyPE property = setAnyProperty(toplessSample);
prepareLoadSample(sampleIdentifier, toplessSample);
@@ -548,10 +548,10 @@ public class ETLServiceTest extends AbstractServerTestCase
public void testTryToGetPropertiesOfTopSampleWhichHasNoProperties()
{
final SampleIdentifier sampleIdentifier =
- new SampleIdentifier(new DatabaseInstanceIdentifier("db"), "s1");
- SamplePE sample = createSample("s1");
- SamplePE top = createSample("s2");
- SamplePE parent = createSample("s3");
+ new SampleIdentifier(new DatabaseInstanceIdentifier("DB"), "S1");
+ SamplePE sample = createSample("S1");
+ SamplePE top = createSample("S2");
+ SamplePE parent = createSample("S3");
parent.addParentRelationship(new SampleRelationshipPE(top, parent,
createParentChildRelation()));
sample.addParentRelationship(new SampleRelationshipPE(parent, sample,
@@ -571,10 +571,10 @@ public class ETLServiceTest extends AbstractServerTestCase
public void testTryToGetPropertiesOfTopSample()
{
final SampleIdentifier sampleIdentifier =
- new SampleIdentifier(new DatabaseInstanceIdentifier("db"), "s1");
- SamplePE sample = createSample("s1");
- SamplePE top = createSample("s2");
- SamplePE parent = createSample("s3");
+ new SampleIdentifier(new DatabaseInstanceIdentifier("DB"), "S1");
+ SamplePE sample = createSample("S1");
+ SamplePE top = createSample("S2");
+ SamplePE parent = createSample("S3");
parent.addParentRelationship(new SampleRelationshipPE(top, parent,
createParentChildRelation()));
sample.addParentRelationship(new SampleRelationshipPE(parent, sample,
@@ -730,7 +730,7 @@ public class ETLServiceTest extends AbstractServerTestCase
public void testRegisterDataSetForUnknownExperiment()
{
final SampleIdentifier sampleIdentifier =
- new SampleIdentifier(new DatabaseInstanceIdentifier("db"), "s1");
+ new SampleIdentifier(new DatabaseInstanceIdentifier("DB"), "S1");
prepareTryToLoadSample(sampleIdentifier, new SamplePE());
try
@@ -739,7 +739,7 @@ public class ETLServiceTest extends AbstractServerTestCase
fail("UserFailureException expected");
} catch (UserFailureException e)
{
- assertEquals("No experiment found for sample DB:/s1", e.getMessage());
+ assertEquals("No experiment found for sample DB:/S1", e.getMessage());
}
context.assertIsSatisfied();
@@ -749,7 +749,7 @@ public class ETLServiceTest extends AbstractServerTestCase
public void testRegisterDataSetForInvalidExperiment()
{
SampleIdentifier sampleIdentifier =
- new SampleIdentifier(new DatabaseInstanceIdentifier("db"), "s1");
+ new SampleIdentifier(new DatabaseInstanceIdentifier("DB"), "S1");
ExperimentPE experiment = createExperiment("TYPE", "EXP1", "G1");
experiment.setDeletion(new DeletionPE());
prepareTryToLoadSample(sampleIdentifier, createSampleWithExperiment(experiment));
@@ -772,7 +772,7 @@ public class ETLServiceTest extends AbstractServerTestCase
public void testRegisterDataSet()
{
final SampleIdentifier sampleIdentifier =
- new SampleIdentifier(new DatabaseInstanceIdentifier("db"), "s1");
+ new SampleIdentifier(new DatabaseInstanceIdentifier("DB"), "S1");
final ExperimentPE experiment = createExperiment("TYPE", "EXP1", "G1");
SamplePE sample = createSampleWithExperiment(experiment);
prepareTryToLoadSample(sampleIdentifier, sample);
@@ -965,7 +965,7 @@ public class ETLServiceTest extends AbstractServerTestCase
material.setCode("new-material");
final MaterialTypePE materialType = new MaterialTypePE();
materialType.setCode("new-material-type");
- materialType.setDatabaseInstance(new DatabaseInstancePEBuilder().code("db")
+ materialType.setDatabaseInstance(new DatabaseInstancePEBuilder().code("DB")
.getDatabaseInstance());
final NewMaterial newMaterial = new NewMaterial(material.getCode());
Map<String, List<NewMaterial>> materialRegistrations =
@@ -973,7 +973,7 @@ public class ETLServiceTest extends AbstractServerTestCase
materialRegistrations.put(materialType.getCode(), Arrays.asList(newMaterial));
final SamplePE newSamplePE = createSampleWithExperiment(experiment);
- newSamplePE.setCode("sample code new");
+ newSamplePE.setCode("SAMPLE_CODE_NEW");
final SampleIdentifier newSampleIdentifier = newSamplePE.getSampleIdentifier();
final NewSample newSample = new NewSample();
newSample.setIdentifier(newSampleIdentifier.toString());
@@ -1167,7 +1167,7 @@ public class ETLServiceTest extends AbstractServerTestCase
one(sampleBO).loadBySampleIdentifier(sampleIdentifier);
one(sampleBO).getSample();
SamplePE sample = new SamplePE();
- sample.setCode("s2");
+ sample.setCode("S2");
sample.setSpace(createGroup("G1"));
sample.setExperiment(experiment);
will(returnValue(sample));
@@ -1195,9 +1195,9 @@ public class ETLServiceTest extends AbstractServerTestCase
private SamplePE createSample()
{
final SamplePE sample = new SamplePE();
- sample.setCode("sample code");
+ sample.setCode("SAMPLE_CODE");
final SampleTypePE sampleType = new SampleTypePE();
- sampleType.setCode("sample type code");
+ sampleType.setCode("SAMPLE_TYPE_CODE");
sampleType.setContainerHierarchyDepth(1);
sampleType.setGeneratedFromHierarchyDepth(1);
sampleType.setListable(false);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/NewSamplesWithTypePredicateTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/NewSamplesWithTypePredicateTest.java
index 2d6d39d2e1df32996a435e20ea8f310e012051a0..3bf32963af0990eaa0a7131461d192a486ff3d52 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/NewSamplesWithTypePredicateTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/NewSamplesWithTypePredicateTest.java
@@ -71,9 +71,9 @@ public class NewSamplesWithTypePredicateTest extends AuthorizationTestCase
final PersonPE person = createPerson();
final List<RoleWithIdentifier> roles = createRoles(true);
final SampleIdentifier sampleIdentifier1 =
- new SampleIdentifier(new DatabaseInstanceIdentifier(INSTANCE_CODE), "s1");
+ new SampleIdentifier(new DatabaseInstanceIdentifier(INSTANCE_CODE), "S1");
final SampleIdentifier sampleIdentifier2 =
- new SampleIdentifier(new DatabaseInstanceIdentifier(INSTANCE_CODE), "s2");
+ new SampleIdentifier(new DatabaseInstanceIdentifier(INSTANCE_CODE), "S2");
context.checking(new Expectations()
{
{
@@ -105,9 +105,9 @@ public class NewSamplesWithTypePredicateTest extends AuthorizationTestCase
final PersonPE person = createPerson();
final List<RoleWithIdentifier> roles = createRoles(true);
final SampleIdentifier sampleIdentifier1 =
- new SampleIdentifier(new DatabaseInstanceIdentifier(INSTANCE_CODE), "s1");
+ new SampleIdentifier(new DatabaseInstanceIdentifier(INSTANCE_CODE), "S1");
final SampleIdentifier sampleIdentifier2 =
- new SampleIdentifier(new DatabaseInstanceIdentifier(INSTANCE_CODE), "s2");
+ new SampleIdentifier(new DatabaseInstanceIdentifier(INSTANCE_CODE), "S2");
context.checking(new Expectations()
{
{
@@ -137,9 +137,9 @@ public class NewSamplesWithTypePredicateTest extends AuthorizationTestCase
final PersonPE person = createPerson();
final List<RoleWithIdentifier> roles = createRoles(true);
final SampleIdentifier sampleIdentifier1 =
- new SampleIdentifier(new DatabaseInstanceIdentifier(INSTANCE_CODE), "s1");
+ new SampleIdentifier(new DatabaseInstanceIdentifier(INSTANCE_CODE), "S1");
final SampleIdentifier sampleIdentifier2 =
- new SampleIdentifier(new DatabaseInstanceIdentifier(INSTANCE_CODE), "s2");
+ new SampleIdentifier(new DatabaseInstanceIdentifier(INSTANCE_CODE), "S2");
context.checking(new Expectations()
{
{
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/NewSampleParserObjectFactoryTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/NewSampleParserObjectFactoryTest.java
index 35484205dff5c246fe0d70e6a38710568bfc1b98..ed80876c42cd7ff18d6d6219a6a00150132f25b8 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/NewSampleParserObjectFactoryTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/NewSampleParserObjectFactoryTest.java
@@ -188,9 +188,9 @@ public final class NewSampleParserObjectFactoryTest
final NewSampleParserObjectFactory parserObjectFactory =
createNewSampleParserObjectFactory(createPropertyMapper(), true);
final NewSample objectCreated = parserObjectFactory.createObject(lineTokens);
- assertEquals(objectCreated.getIdentifier(), lineTokens[1]);
+ assertEquals(objectCreated.getIdentifier(), toUpperCase(lineTokens[1]));
assertEquals(objectCreated.getContainerIdentifier(),
- StringUtils.isEmpty(lineTokens[2]) ? null : lineTokens[2]);
+ StringUtils.isEmpty(lineTokens[2]) ? null : toUpperCase(lineTokens[2]));
assertEquals(objectCreated.getParentIdentifier(), StringUtils.isEmpty(lineTokens[3]) ? null
: lineTokens[3]);
final IEntityProperty[] properties = objectCreated.getProperties();
@@ -201,4 +201,9 @@ public final class NewSampleParserObjectFactoryTest
sampleProperty.getValue().equals(lineTokens[index++]);
}
}
+
+ private String toUpperCase(String identifier)
+ {
+ return identifier == null ? null : identifier.toUpperCase();
+ }
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/UpdatedSampleParserObjectFactoryTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/UpdatedSampleParserObjectFactoryTest.java
index f30b2f16339c6b584443f737dc446e6d0413c878..ed7cf2bdfef03bd1670caddc4269efe5e83cb760 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/UpdatedSampleParserObjectFactoryTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/parser/UpdatedSampleParserObjectFactoryTest.java
@@ -87,8 +87,8 @@ public final class UpdatedSampleParserObjectFactoryTest
public final void testCreateObject(final String[] lineTokens, final int numberOfProperties,
final int numOfPropertiestoUpdate)
{
- final String identifierToken = lineTokens[0];
- final String containerToken = lineTokens[1];
+ final String identifierToken = lineTokens[0].toUpperCase();
+ final String containerToken = lineTokens[1].toUpperCase();
final String p1Token = lineTokens[2];
final String p2Token = lineTokens[3];
final UpdatedSampleParserObjectFactory parserObjectFactory =
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceTest.java
index c1787f8329e865f44a39ee7a954ccc0d4b8aae56..9d13c11873e434704d2e98830331f8e5898c2de3 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientServiceTest.java
@@ -695,8 +695,7 @@ public final class GenericClientServiceTest extends AbstractClientServiceTest
public final void testRegisterExperiment()
{
final NewExperiment newExperiment =
- createNewExperiment("/group1/project1/exp1", "SIRNA_HCS",
- IEntityProperty.EMPTY_ARRAY);
+ createNewExperiment("/S1/P1/E1", "SIRNA_HCS", IEntityProperty.EMPTY_ARRAY);
final String attachmentSessionKey = "attachment-session-key";
final String sampleSessionKey = "sample-session-key";
context.checking(new Expectations()
@@ -717,7 +716,7 @@ public final class GenericClientServiceTest extends AbstractClientServiceTest
final NewExperiment experiment =
(NewExperiment) invocation.getParameter(1);
assertEquals("SIRNA_HCS", experiment.getExperimentTypeCode());
- assertEquals("/group1/project1/exp1", experiment.getIdentifier());
+ assertEquals("/S1/P1/E1", experiment.getIdentifier());
final Collection<NewAttachment> attachments =
(Collection<NewAttachment>) invocation.getParameter(2);
assertEquals(0, attachments.size());