Skip to content
Snippets Groups Projects
Commit cd354662 authored by buczekp's avatar buczekp
Browse files

[LMS-1676] extended basic headless system test

SVN: 17395
parent cf384117
No related branches found
No related tags found
No related merge requests found
...@@ -19,6 +19,7 @@ package ch.systemsx.cisd.openbis.systemtest.plugin.generic; ...@@ -19,6 +19,7 @@ package ch.systemsx.cisd.openbis.systemtest.plugin.generic;
import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.fail; import static org.testng.AssertJUnit.fail;
import java.util.Arrays;
import java.util.List; import java.util.List;
import org.testng.annotations.Test; import org.testng.annotations.Test;
...@@ -27,6 +28,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.GridRowModels; ...@@ -27,6 +28,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.GridRowModels;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ListSampleDisplayCriteria; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ListSampleDisplayCriteria;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ResultSetWithEntityTypes; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ResultSetWithEntityTypes;
import ch.systemsx.cisd.openbis.generic.shared.basic.GridRowModel; import ch.systemsx.cisd.openbis.generic.shared.basic.GridRowModel;
import ch.systemsx.cisd.openbis.generic.shared.basic.IdentifierExtractor;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ListSampleCriteria; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ListSampleCriteria;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
...@@ -34,8 +36,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample; ...@@ -34,8 +36,6 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
/** /**
*
*
* @author Franz-Josef Elmer * @author Franz-Josef Elmer
*/ */
@Test(groups = "system test") @Test(groups = "system test")
...@@ -45,23 +45,29 @@ public class SampleRegistrationTest extends GenericSystemTestCase ...@@ -45,23 +45,29 @@ public class SampleRegistrationTest extends GenericSystemTestCase
public void testSimpleRegistration() public void testSimpleRegistration()
{ {
logIntoCommonClientService(); logIntoCommonClientService();
NewSample sample = new NewSample(); NewSample sample = new NewSample();
String identifier = "/cisd/" + commonClientService.generateCode("S-"); String identifier = "/cisd/" + commonClientService.generateCode("S-");
sample.setIdentifier(identifier); sample.setIdentifier(identifier);
SampleType sampleType = new SampleType(); SampleType sampleType = new SampleType();
sampleType.setCode("CELL_PLATE"); sampleType.setCode("CELL_PLATE");
sample.setSampleType(sampleType); sample.setSampleType(sampleType);
sample.setProperties(new IEntityProperty[] {property("COMMENT", "test sample")}); sample.setProperties(new IEntityProperty[]
{ property("COMMENT", "test sample") });
sample.setParents(new String[]
{ "c1", "C2" });
genericClientService.registerSample("session", sample); genericClientService.registerSample("session", sample);
Sample s = getSample(identifier); Sample s = getSample(identifier);
List<IEntityProperty> properties = s.getProperties(); List<IEntityProperty> properties = s.getProperties();
assertEquals("COMMENT", properties.get(0).getPropertyType().getCode()); assertEquals("COMMENT", properties.get(0).getPropertyType().getCode());
assertEquals("test sample", properties.get(0).getValue()); assertEquals("test sample", properties.get(0).getValue());
assertEquals(1, properties.size()); assertEquals(1, properties.size());
assertEquals(2, s.getParents().size());
assertEquals("[CISD:/CISD/C1, CISD:/CISD/C2]", Arrays.toString(IdentifierExtractor.extract(
s.getParents()).toArray()));
} }
private Sample getSample(String sampleIdentifier) private Sample getSample(String sampleIdentifier)
{ {
ListSampleCriteria listCriteria = new ListSampleCriteria(); ListSampleCriteria listCriteria = new ListSampleCriteria();
...@@ -72,7 +78,7 @@ public class SampleRegistrationTest extends GenericSystemTestCase ...@@ -72,7 +78,7 @@ public class SampleRegistrationTest extends GenericSystemTestCase
for (GridRowModel<Sample> gridRowModel : list) for (GridRowModel<Sample> gridRowModel : list)
{ {
Sample sample = gridRowModel.getOriginalObject(); Sample sample = gridRowModel.getOriginalObject();
System.out.println("SAMPLE:"+sample.getIdentifier()); System.out.println("SAMPLE:" + sample.getIdentifier());
if (sample.getIdentifier().endsWith(sampleIdentifier.toUpperCase())) if (sample.getIdentifier().endsWith(sampleIdentifier.toUpperCase()))
{ {
return sample; return sample;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment