[BIS-278/SP-417] Add tech id and perm id to API version of Project DTO: fix unit tests.

SVN: 28416

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)));

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());