diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.java index e766483f9def7ab96167aed3c3e294bf8347dbc3..b154c0d1aebdd1437a2bd1561d5d0eff0573f6e2 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.java @@ -190,9 +190,13 @@ public class GeneralInformationServiceTest extends AbstractServerTestCase one(projectDAO).listProjects(spaces.get(0)); ProjectPE a = new ProjectPE(); + a.setId(1L); + a.setPermId("1"); a.setCode("a"); a.setSpace(spaces.get(0)); ProjectPE b = new ProjectPE(); + b.setId(2L); + b.setPermId("2"); b.setCode("b"); b.setSpace(spaces.get(0)); will(returnValue(Arrays.asList(a, b))); @@ -202,6 +206,8 @@ public class GeneralInformationServiceTest extends AbstractServerTestCase one(projectDAO).listProjects(spaces.get(2)); ProjectPE c = new ProjectPE(); + c.setId(3L); + c.setPermId("3"); c.setCode("c"); c.setSpace(spaces.get(0)); will(returnValue(Arrays.asList(c))); @@ -553,6 +559,8 @@ public class GeneralInformationServiceTest extends AbstractServerTestCase one(projectDAO).listProjects(spaces.get(0)); ProjectPE project1 = new ProjectPE(); + project1.setId(1L); + project1.setPermId("1"); project1.setCode("PROJECT-1"); project1.setSpace(spaces.get(0)); will(returnValue(Collections.singletonList(project1))); diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ExperimentBuilder.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ExperimentBuilder.java index 518418ec105245f8b1eee843fe17fc8d31c082df..1cbcae2dd5e66dfcfa889dc30487067674bd5fb4 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ExperimentBuilder.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/builders/ExperimentBuilder.java @@ -38,6 +38,8 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifi */ public class ExperimentBuilder { + private static long count = 0; + private final Experiment experiment = new Experiment(); public ExperimentBuilder() @@ -71,6 +73,9 @@ public class ExperimentBuilder ExperimentIdentifier experimentIdentifier = factory.createIdentifier(); experiment.setCode(experimentIdentifier.getExperimentCode()); Project project = new Project(); + ++count; + project.setId(count); + project.setPermId(Long.toString(count)); project.setCode(experimentIdentifier.getProjectCode()); Space space = new Space(); space.setCode(experimentIdentifier.getSpaceCode());