--- a/server/src/test/java/org/iri_research/renkan/test/repositories/ProjectsRepositoryTest.java Tue Apr 23 16:54:18 2013 +0200
+++ b/server/src/test/java/org/iri_research/renkan/test/repositories/ProjectsRepositoryTest.java Wed Apr 24 14:08:19 2013 +0200
@@ -92,7 +92,7 @@
logger.debug("Setup");
// CREATE USERS
- for(int i=0; i<SPACE_NB; i++) {
+ for(int i=0; i<SPACE_NB+1; i++) {
this.testUsers.add(new User(UUID.randomUUID().toString(), "test_user"+(i+1), "Test user " + (i+1), "http://www.iri.centrepompidou.fr/users/test_user"+(i+1), "#"+ColorGenerator.randomColorHex()));
}
usersRepository.save(this.testUsers);
@@ -107,12 +107,20 @@
for(int j=0; j<SPACE_NB-1-i; j++) {
final Project project = new Project(testSpace.getId(), UUID.randomUUID().toString(), "test project "+((SPACE_NB-1)*i+j+1), "desc"+((SPACE_NB-1)*i+j+1), "http://localhost:8080/rest/projects/id"+((SPACE_NB-1)*i+j+1), this.creationDate);
pl.add(project);
- for(int k=0; k<SPACE_NB-j; k++) {
- project.addUser(this.testUsers.get(k));
+ }
+ }
+
+ for(int i=0; i<testUsers.size()-1;i++) {
+ User u = this.testUsers.get(i);
+ for(int j=0;j<pl.size();j++) {
+ Project p = pl.get(j);
+ if(j<pl.size()-i) {
+ p.addUser(u);
}
- for(int k=SPACE_NB-j; k<SPACE_NB; k++) {
- project.addUser(null,null);
+ else {
+ p.addUser(null, null);
}
+
}
}
@@ -255,17 +263,21 @@
public void testGetCountByUser() {
Map<String, Integer> groupRes = projectsRepository.getCountByUser();
+ int nu = this.testUsers.size();
Assert.assertNotNull("GroupRes not null", groupRes);
- Assert.assertEquals("Group res size", testProjects.size()+1, groupRes.size());
+ Assert.assertEquals("Group res size", nu, groupRes.size());
- for(int i=0;i<testProjects.size()+1;i++) {
- Integer count = groupRes.get(this.testProjects.get(i).getId());
+ for(int i=0;i<nu-1;i++) {
+ Integer count = groupRes.get(this.testUsers.get(i).getId());
Assert.assertNotNull("count not null", count);
Assert.assertEquals("Nb of user/project", testProjects.size()-i, count.intValue());
}
+ Assert.assertNull("Last user id has no project i.e count is null", groupRes.get(this.testUsers.get(nu-1)));
- //Assert.assertNull("Last space id has no project i.e count is null", groupRes.get(this.spaceIds.get(SPACE_NB-1)));
+ Integer count = groupRes.get(null);
+ Assert.assertNotNull("count not null", count);
+ Assert.assertEquals("Nb of anonymous user/project", (nu-1)*(nu-2)/2, count.intValue());
}
@Test