Renkan Admin

Groupname	Edit	Delete
groupname	Edit	Delete

Name	Created	Project count	url	Edit	Delete	Name	Created	Project count	url	Edit	Delete
title	created	nb. proj	url	Edit	DeleteDelete	title	created	nb. proj	url	Edit	DeleteDelete

Username	Project count	Edit	Delete
username	nb. proj	Edit	DeleteDelete

"+this._get(t,"weekHeader")+"
"+this._get(t,"calculateWeek")(H)+"	"+(W&&!v?" ":j?""+H.getDate()+"":""+H.getDate()+"")+"

"+this._get(t,"weekHeader")+"
"+this._get(t,"calculateWeek")(E)+"	"+(F&&!v?" ":R?""+E.getDate()+"":""+E.getDate()+"")+"

").attr({id:i,role:"tooltip"}).addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||""));return t("

").addClass("ui-tooltip-content").appendTo(n),n.appendTo(this.document[0].body),this.tooltips[i]=e,n},_find:function(e){var i=e.data("ui-tooltip-id");return i?t("#"+i):t()},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s[0],e.close(n,!0),t("#"+i).remove(),s.data("ui-tooltip-title")&&(s.attr("title",s.data("ui-tooltip-title")),s.removeData("ui-tooltip-title"))})}})}(jQuery); \ No newline at end of file diff -r 2e738512336a -r 18a43ba77ad0 server/src/test/java/org/iri_research/renkan/test/controller/AdminControllerTest.java --- a/server/src/test/java/org/iri_research/renkan/test/controller/AdminControllerTest.java Fri Oct 25 16:42:11 2013 +0200 +++ b/server/src/test/java/org/iri_research/renkan/test/controller/AdminControllerTest.java Wed Jan 15 18:36:27 2014 +0100 @@ -1,27 +1,24 @@ package org.iri_research.renkan.test.controller; -import java.security.SecureRandom; import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.TimeZone; import java.util.UUID; -import org.apache.commons.codec.binary.Hex; import org.iri_research.renkan.models.Project; import org.iri_research.renkan.models.Space; import org.iri_research.renkan.repositories.ProjectsRepository; import org.iri_research.renkan.repositories.SpacesRepository; +import org.joda.time.DateTime; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; @@ -31,449 +28,87 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.context.WebApplicationContext; -import org.springframework.web.util.NestedServletException; @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration -@ContextConfiguration(locations={"controller-context.xml", "file:src/main/webapp/WEB-INF/spring-servlet.xml"}) +@ContextConfiguration(locations = { "controller-context.xml", + "file:src/main/webapp/WEB-INF/spring-servlet.xml" }) public class AdminControllerTest { - - private final static int SPACE_NB = 3; - - private Logger logger = LoggerFactory.getLogger(AdminControllerTest.class); - - @Autowired - private SpacesRepository spacesRepository; - @Autowired - private ProjectsRepository projectsRepository; - - private Map spacesList = new HashMap(SPACE_NB); - private List spacesUuids = new ArrayList<>(SPACE_NB); - - private ArrayList testProjects = new ArrayList(); - - @Autowired - private WebApplicationContext context; - private MockMvc mvc; - - - @Before - public void setup() { - - logger.debug("Setup"); - spacesRepository.deleteAll(); - projectsRepository.deleteAll(); - - ArrayList pl = new ArrayList(); - for(int i=0;i spacesList = new HashMap(SPACE_NB); + private List spacesUuids = new ArrayList<>(SPACE_NB); + + private ArrayList testProjects = new ArrayList(); - @Test - public void testSpacePostCreate() throws Exception { - - MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post("/admin/spaces/save"); - post = post.param("title", "New title"); - post = post.param("description", "New description"); - post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); - post = post.param("color", "#ffffff"); - post = post.param("binConfig", "{}"); - - this.mvc.perform(post) - .andExpect(MockMvcResultMatchers.status().isSeeOther()) - .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/spaces")); - - - Assert.assertEquals("Must have one more space", SPACE_NB + 1, this.spacesRepository.count()); - - for (Space sp : this.spacesRepository.findAll()) { - if(this.spacesList.containsKey(sp.getId())) { - continue; - } - else { - Assert.assertNotNull("Should find space", sp); - Assert.assertEquals("Title equals", "New title", sp.getTitle()); - Assert.assertEquals("Description equals", "New description", sp.getDescription()); - Assert.assertEquals("Uri equals", "http://ldt.iri.centrepompidou.fr/new/uri", sp.getUri()); - Assert.assertEquals("Color equals", "#ffffff", sp.getColor()); - Assert.assertEquals("BinConfig equals", "{}", sp.getBinConfig()); - Assert.assertTrue("id sould match uuid regex", sp.getId().matches("[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}")); - Assert.assertNotNull("Date created should be not null", sp.getCreated()); - } - } - } - - @Test - public void testSpacePostUpdateEmptyTitle() throws Exception { - - MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post("/admin/spaces/save"); - post = post.param("id", this.spacesUuids.get(0)); - post = post.param("title", ""); - post = post.param("description", "New description"); - post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); - post = post.param("color", "#ffffff"); - post = post.param("binConfig", "{}"); - - this.mvc.perform(post) - .andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.view().name("admin/spaceEdit")) - .andExpect(MockMvcResultMatchers.model().hasErrors()) - .andExpect(MockMvcResultMatchers.model().errorCount(1)) - .andExpect(MockMvcResultMatchers.model().attributeHasErrors("space")) - .andExpect(MockMvcResultMatchers.model().attributeHasFieldErrors("space", "title")); - - Space sp = this.spacesRepository.findOne(this.spacesUuids.get(0)); - - Assert.assertNotNull("Should find space", sp); - Assert.assertEquals("Title equals", "test 0", sp.getTitle()); - - } - - @Test - public void testSpacePostCreateEmptyTitle() throws Exception { - - MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post("/admin/spaces/save"); - post = post.param("title", ""); - post = post.param("description", "New description"); - post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); - post = post.param("color", "#ffffff"); - post = post.param("binConfig", "{}"); - - this.mvc.perform(post) - .andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.view().name("admin/spaceEdit")) - .andExpect(MockMvcResultMatchers.model().hasErrors()) - .andExpect(MockMvcResultMatchers.model().errorCount(1)) - .andExpect(MockMvcResultMatchers.model().attributeHasErrors("space")) - .andExpect(MockMvcResultMatchers.model().attributeHasFieldErrors("space", "title")); - - Assert.assertEquals("Must not have one more space", SPACE_NB, this.spacesRepository.count()); - - } + @Autowired + private WebApplicationContext context; + private MockMvc mvc; + + @Before + public void setup() { + + logger.debug("Setup"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + spacesRepository.deleteAll(); + projectsRepository.deleteAll(); - @Test - public void testSpacePostUpdateBadJson() throws Exception { - - MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post("/admin/spaces/save"); - post = post.param("id", this.spacesUuids.get(0)); - post = post.param("title", "New Title"); - post = post.param("description", "New description"); - post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); - post = post.param("color", "#ffffff"); - post = post.param("binConfig", "{"); - - this.mvc.perform(post) - .andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.view().name("admin/spaceEdit")) - .andExpect(MockMvcResultMatchers.model().hasErrors()) - .andExpect(MockMvcResultMatchers.model().errorCount(1)) - .andExpect(MockMvcResultMatchers.model().attributeHasErrors("space")) - .andExpect(MockMvcResultMatchers.model().attributeHasFieldErrors("space", "binConfig")); - - Space sp = this.spacesRepository.findOne(this.spacesUuids.get(0)); - - Assert.assertNotNull("Should find space", sp); - Assert.assertEquals("Bin config equals", "{}", sp.getBinConfig()); - - } - - @Test - public void testSpacePostCreateBadJson() throws Exception { - - MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post("/admin/spaces/save"); - post = post.param("title", "New Title"); - post = post.param("description", "New description"); - post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); - post = post.param("color", "#ffffff"); - post = post.param("binConfig", "}"); - - this.mvc.perform(post) - .andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.view().name("admin/spaceEdit")) - .andExpect(MockMvcResultMatchers.model().hasErrors()) - .andExpect(MockMvcResultMatchers.model().errorCount(1)) - .andExpect(MockMvcResultMatchers.model().attributeHasErrors("space")) - .andExpect(MockMvcResultMatchers.model().attributeHasFieldErrors("space", "binConfig")); - - Assert.assertEquals("Must not have one more space", SPACE_NB, this.spacesRepository.count()); - - } - - @Test - public void testSpacePostUpdateAllErrors() throws Exception { - - MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post("/admin/spaces/save"); - post = post.param("id", this.spacesUuids.get(0)); - post = post.param("title", ""); - post = post.param("description", "New description"); - post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); - post = post.param("color", "#ffffff"); - post = post.param("binConfig", "{"); - - this.mvc.perform(post) - .andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.view().name("admin/spaceEdit")) - .andExpect(MockMvcResultMatchers.model().hasErrors()) - .andExpect(MockMvcResultMatchers.model().errorCount(2)) - .andExpect(MockMvcResultMatchers.model().attributeHasErrors("space")) - .andExpect(MockMvcResultMatchers.model().attributeHasFieldErrors("space", "title")) - .andExpect(MockMvcResultMatchers.model().attributeHasFieldErrors("space", "binConfig")); - - Space sp = this.spacesRepository.findOne(this.spacesUuids.get(0)); - - Assert.assertNotNull("Should find space", sp); - Assert.assertEquals("Bin config equals", "{}", sp.getBinConfig()); - Assert.assertEquals("title equals", "test 0", sp.getTitle()); - - } - - @Test - public void testSpacePostCreateAllErrors() throws Exception { - - MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post("/admin/spaces/save"); - post = post.param("title", ""); - post = post.param("description", "New description"); - post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); - post = post.param("color", "#ffffff"); - post = post.param("binConfig", "}"); - - this.mvc.perform(post) - .andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.view().name("admin/spaceEdit")) - .andExpect(MockMvcResultMatchers.model().hasErrors()) - .andExpect(MockMvcResultMatchers.model().errorCount(2)) - .andExpect(MockMvcResultMatchers.model().attributeHasErrors("space")) - .andExpect(MockMvcResultMatchers.model().attributeHasFieldErrors("space", "title")) - .andExpect(MockMvcResultMatchers.model().attributeHasFieldErrors("space", "binConfig")); - - Assert.assertEquals("Must not have one more space", SPACE_NB, this.spacesRepository.count()); - - } - - @Test - public void testDeleteSpace() throws Exception { - - MockHttpServletRequestBuilder get = MockMvcRequestBuilders.get("/admin/spaces/delete/"+this.spacesUuids.get(SPACE_NB-1)); - - MvcResult res = this.mvc.perform(get) - .andExpect(MockMvcResultMatchers.status().isOk()) - .andExpect(MockMvcResultMatchers.view().name("admin/spaceDeleteConfirm")) - .andExpect(MockMvcResultMatchers.model().attributeExists("spaceObj", "key", "salt")) - .andReturn(); - - Map model = res.getModelAndView().getModel(); - - Space space = (Space)model.get("spaceObj"); - Assert.assertNotNull("Space is not null", space); - Assert.assertEquals("Must be first space id", this.spacesUuids.get(SPACE_NB-1), space.getId()); - - String key = (String)model.get("key"); - Assert.assertNotNull("key is not null", key); - - String salt = (String)model.get("salt"); - Assert.assertNotNull("salt is not null", salt); - - Assert.assertTrue("Key must be checked", space.checkKey(key, salt)); - - } + ArrayList pl = new ArrayList(); + for (int i = 0; i < SPACE_NB; i++) { + DateTime creationDate = new DateTime(); + String uuid = UUID.randomUUID().toString(); + spacesUuids.add(uuid); + Space testSpace = new Space(uuid, "test " + i, "Test space " + 1, + "{}", "http://ldt.iri.centrepompidou.fr", "#ababab", + "test_user", "http://ldt.iri.centrepompidou.fr", + creationDate); + testSpace = spacesRepository.save(testSpace); + this.spacesList.put(uuid, testSpace); + for (int j = 0; j < SPACE_NB - 1 - i; j++) { + pl.add(new Project(testSpace.getId(), UUID.randomUUID() + .toString(), "test" + ((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), creationDate)); + } + try { + Thread.sleep(1); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } - @Test - public void testDeleteFakeSpace() throws Exception { - - MockHttpServletRequestBuilder get = MockMvcRequestBuilders.get("/admin/spaces/delete/" + UUID.randomUUID().toString()); - - try { - this.mvc.perform(get) - .andExpect(MockMvcResultMatchers.status().isNotFound()); - } - catch(NestedServletException e) { - Assert.assertNotNull("Nested exception must not be null", e.getCause()); - Assert.assertEquals("Inner exception must be a HttpClientErrorException", HttpClientErrorException.class, e.getCause().getClass()); - Assert.assertEquals("Exception error status must be not found", HttpStatus.NOT_FOUND, ((HttpClientErrorException)e.getCause()).getStatusCode()); - } - - } - - @Test - public void testDeleteSpaceProject() throws Exception { - - MockHttpServletRequestBuilder get = MockMvcRequestBuilders.get("/admin/spaces/delete/" + this.spacesUuids.get(0)); - - try { - this.mvc.perform(get) - .andExpect(MockMvcResultMatchers.status().isBadRequest()); - } - catch(NestedServletException e) { - Assert.assertNotNull("Nested exception must not be null", e.getCause()); - Assert.assertEquals("Inner exception must be a HttpClientErrorException", HttpClientErrorException.class, e.getCause().getClass()); - Assert.assertEquals("Exception error status must be not found", HttpStatus.BAD_REQUEST, ((HttpClientErrorException)e.getCause()).getStatusCode()); - } - - } - - @Test - public void testDoDeleteSpaceNoKey() throws Exception { - MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post("/admin/spaces/delete/"+this.spacesUuids.get(SPACE_NB-1)); - - try { - this.mvc.perform(post) - .andExpect(MockMvcResultMatchers.status().isBadRequest()); - } - catch(NestedServletException e) { - Assert.assertNotNull("Nested exception must not be null", e.getCause()); - Assert.assertEquals("Inner exception must be a HttpClientErrorException", HttpClientErrorException.class, e.getCause().getClass()); - Assert.assertEquals("Exception error status must be not found", HttpStatus.BAD_REQUEST, ((HttpClientErrorException)e.getCause()).getStatusCode()); - } + for (Project p : projectsRepository.save(pl)) { + this.testProjects.add(p); + } + + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).build(); + } - - Assert.assertEquals("Must have same nb of space", SPACE_NB, this.spacesRepository.count()); - - } - - @Test - public void testDoDeleteSpace() throws Exception { - - Space space = this.spacesList.get(this.spacesUuids.get(SPACE_NB-1)); - - SecureRandom rand = SecureRandom.getInstance("SHA1PRNG"); - rand.setSeed(System.currentTimeMillis()); - byte[] rawSalt = new byte[50]; - rand.nextBytes(rawSalt); - String salt = Hex.encodeHexString(rawSalt); - String key = space.getKey(salt); - - - MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post(String.format("/admin/spaces/delete/%s?key=%s&salt=%s",this.spacesUuids.get(SPACE_NB-1), key, salt)); - - this.mvc.perform(post) - .andExpect(MockMvcResultMatchers.status().isSeeOther()) - .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/spaces")); - - Assert.assertEquals("Must have one less space", SPACE_NB-1, this.spacesRepository.count()); - - space = this.spacesRepository.findOne(this.spacesUuids.get(SPACE_NB-1)); - - Assert.assertNull("Space " + this.spacesUuids.get(SPACE_NB-1) + " deleted", space); - - } + @After + public void teardown() { + spacesRepository.deleteAll(); + projectsRepository.deleteAll(); + } - - @Test - public void testDoDeleteSpaceFake() throws Exception { - - Space space = this.spacesList.get(this.spacesUuids.get(SPACE_NB-1)); - - SecureRandom rand = SecureRandom.getInstance("SHA1PRNG"); - rand.setSeed(System.currentTimeMillis()); - byte[] rawSalt = new byte[50]; - rand.nextBytes(rawSalt); - String salt = Hex.encodeHexString(rawSalt); - String key = space.getKey(salt); - - - MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post(String.format("/admin/spaces/delete/%s?key=%s&salt=%s",UUID.randomUUID(), key, salt)); - - this.mvc.perform(post) - .andExpect(MockMvcResultMatchers.status().isSeeOther()) - .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/spaces")); - - Assert.assertEquals("Must have the same nb of space", SPACE_NB, this.spacesRepository.count()); - - } + @Test + public void testContext() throws Exception { + MockHttpServletRequestBuilder get = MockMvcRequestBuilders.get("/"); + MvcResult res = this.mvc.perform(get) + .andExpect(MockMvcResultMatchers.status().isOk()).andReturn(); - @Test - public void testDoDeleteSpaceProject() throws Exception { - - Space space = this.spacesList.get(this.spacesUuids.get(0)); - - SecureRandom rand = SecureRandom.getInstance("SHA1PRNG"); - rand.setSeed(System.currentTimeMillis()); - byte[] rawSalt = new byte[50]; - rand.nextBytes(rawSalt); - String salt = Hex.encodeHexString(rawSalt); - String key = space.getKey(salt); - - - MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post(String.format("/admin/spaces/delete/%s?key=%s&salt=%s",this.spacesUuids.get(0), key, salt)); - - try { - this.mvc.perform(post) - .andExpect(MockMvcResultMatchers.status().isBadRequest()); - } - catch(NestedServletException e) { - Assert.assertNotNull("Nested exception must not be null", e.getCause()); - Assert.assertEquals("Inner exception must be a HttpClientErrorException", HttpClientErrorException.class, e.getCause().getClass()); - Assert.assertEquals("Exception error status must be not found", HttpStatus.BAD_REQUEST, ((HttpClientErrorException)e.getCause()).getStatusCode()); - } - - Assert.assertEquals("Must have the same nb of space", SPACE_NB, this.spacesRepository.count()); - - } + logger.debug("testContext resp : " + + res.getResponse().getContentAsString()); + + } } diff -r 2e738512336a -r 18a43ba77ad0 server/src/test/java/org/iri_research/renkan/test/controller/GroupsAdminControllerTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/test/java/org/iri_research/renkan/test/controller/GroupsAdminControllerTest.java Wed Jan 15 18:36:27 2014 +0100 @@ -0,0 +1,484 @@ +package org.iri_research.renkan.test.controller; + +import java.security.SecureRandom; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TimeZone; +import java.util.UUID; + +import org.apache.commons.codec.binary.Hex; +import org.iri_research.renkan.models.Group; +import org.iri_research.renkan.models.Project; +import org.iri_research.renkan.models.Space; +import org.iri_research.renkan.models.User; +import org.iri_research.renkan.repositories.GroupsRepository; +import org.iri_research.renkan.repositories.ProjectsRepository; +import org.iri_research.renkan.repositories.SpacesRepository; +import org.iri_research.renkan.repositories.UsersRepository; +import org.joda.time.DateTime; +import org.joda.time.LocalDate; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.util.NestedServletException; + + +@RunWith(SpringJUnit4ClassRunner.class) +@WebAppConfiguration +@ContextConfiguration(locations = { "controller-context.xml", + "file:src/main/webapp/WEB-INF/spring-servlet.xml" }) +public class GroupsAdminControllerTest { + + private final static int SPACE_NB = 3; + private final static int USER_NB = 3; + private final static int GROUP_NB = 3; + + private Logger logger = LoggerFactory.getLogger(GroupsAdminControllerTest.class); + + @Autowired + private SpacesRepository spacesRepository; + @Autowired + private ProjectsRepository projectsRepository; + @Autowired + private UsersRepository usersRepository; + @Autowired + private GroupsRepository groupsRepository; + + + + @Autowired + private PasswordEncoder renkanPasswordEncoder; + + private Map spacesList = new HashMap(SPACE_NB); + private List spacesUuids = new ArrayList<>(SPACE_NB); + + private ArrayList testProjects = new ArrayList(); + + private Map usersList = new HashMap(USER_NB); + private List usersUuids = new ArrayList<>(USER_NB); + + private Map groupsList = new HashMap(GROUP_NB); + private List groupsUuids = new ArrayList<>(GROUP_NB); + + + + @Autowired + private WebApplicationContext context; + private MockMvc mvc; + + @Before + public void setup() { + + logger.debug("Setup"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + spacesRepository.deleteAll(); + projectsRepository.deleteAll(); + usersRepository.deleteAll(); + groupsRepository.deleteAll(); + + for(int i=0; i < USER_NB; i++) { + String uuid = UUID.randomUUID().toString(); + User user = new User(uuid, "user" + i, "User nb " + i, "http://www.iri.centrepompidou.fr", "#ababab"); + user.setLocked(false); + user.setEnabled(true); + user.setAvatar("A pretty picture"); + user.setExpirationDate(new LocalDate()); + user.setCredentialsExpirationDate(new LocalDate()); + user.setEmail(String.format("user%d@mail.com", i)); + user = usersRepository.save(user); + this.usersUuids.add(uuid); + this.usersList.put(uuid, user); + } + + + for(int i=0; i < GROUP_NB; i++) { + String uuid = UUID.randomUUID().toString(); + Group group = new Group(uuid, "group" + i, "Group nb " + i, "http://www.iri.centrepompidou.fr/group/"+uuid, "#ababab"); + group.setAvatar("A pretty group picture " + i); + group = groupsRepository.save(group); + this.groupsUuids.add(uuid); + this.groupsList.put(uuid, group); + } + + ArrayList pl = new ArrayList(); + for (int i = 0; i < SPACE_NB; i++) { + DateTime creationDate = new DateTime(); + String uuid = UUID.randomUUID().toString(); + spacesUuids.add(uuid); + Space testSpace = new Space(uuid, "test " + i, "Test space " + 1, + "{}", "http://ldt.iri.centrepompidou.fr", "#ababab", + "test_user", "http://ldt.iri.centrepompidou.fr", + creationDate); + testSpace = spacesRepository.save(testSpace); + this.spacesList.put(uuid, testSpace); + for (int j = 0; j < SPACE_NB - 1 - i; j++) { + Project p = new Project(testSpace.getId(), UUID.randomUUID() + .toString(), "test" + ((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), creationDate); + p.addUser(this.usersList.get(this.usersUuids.get(0))); + pl.add(p); + } + try { + Thread.sleep(1); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + for (Project p : projectsRepository.save(pl)) { + this.testProjects.add(p); + } + + + + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).build(); + } + + @After + public void teardown() { + spacesRepository.deleteAll(); + projectsRepository.deleteAll(); + usersRepository.deleteAll(); + groupsRepository.deleteAll(); + + } + + @Test + public void testGroupPostUpdate() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/groups/save"); + post = post.param("id", this.groupsUuids.get(0)); + post = post.param("title", "New name"); + post = post.param("description", "New description"); + post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); + post = post.param("color", "#ffffff"); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isSeeOther()) + .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/groups")); + + Group group = this.groupsRepository.findOne(this.groupsUuids.get(0)); + + Assert.assertNotNull("Should find space", group); + Assert.assertEquals("Title equals", "New name", group.getTitle()); + Assert.assertEquals("Description equals", "New description", + group.getDescription()); + Assert.assertEquals("Uri equals", + "http://ldt.iri.centrepompidou.fr/new/uri", group.getUri()); + Assert.assertEquals("Color equals", "#ffffff", group.getColor()); + } + + @Test + public void testGroupPostCreate() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/groups/save") + .param("title", "New name") + .param("description", "New description") + .param("uri", "http://ldt.iri.centrepompidou.fr/new/uri") + .param("color", "#ffffff") + .param("avatar", "A pretty avatar"); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isSeeOther()) + .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/groups")); + + Assert.assertEquals("Must have one more group", GROUP_NB + 1, + this.groupsRepository.count()); + + for (Group group : this.groupsRepository.findAll()) { + if (this.groupsList.containsKey(group.getId())) { + continue; + } + else { + Assert.assertNotNull("Should find group", group); + Assert.assertEquals("Title equals", "New name", group.getTitle()); + Assert.assertEquals("Description equals", "New description", + group.getDescription()); + Assert.assertEquals("Uri equals", + "http://ldt.iri.centrepompidou.fr/new/uri", group.getUri()); + Assert.assertEquals("Color equals", "#ffffff", group.getColor()); + Assert.assertEquals("Avatar equals", "A pretty avatar", group.getAvatar()); + Assert.assertTrue( + "id sould match uuid regex", + group.getId() + .matches( + "[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}")); + } + } + } + + @Test + public void testGroupPostUpdateEmptyTitle() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/groups/save") + .param("id", this.groupsUuids.get(0)) + .param("title", "") + .param("description", "New description") + .param("uri", "http://ldt.iri.centrepompidou.fr/new/uri") + .param("color", "#ffffff") + .param("avatar", "A pretty avatar"); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.view().name("admin/groupEdit")) + .andExpect(MockMvcResultMatchers.model().hasErrors()) + .andExpect(MockMvcResultMatchers.model().errorCount(1)) + .andExpect(MockMvcResultMatchers.model().attributeHasErrors("group")) + .andExpect(MockMvcResultMatchers.model().attributeHasFieldErrors("group", "title")); + + Group group = this.groupsRepository.findOne(this.groupsUuids.get(0)); + + Assert.assertNotNull("Should find group", group); + Assert.assertEquals("name equals", "group0", group.getTitle()); + + Assert.assertEquals("name equals", "Group nb 0", group.getDescription()); + + } + + @Test + public void testGroupPostCreateEmptyName() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/groups/save") + .param("title", "") + .param("description", "New description") + .param("uri", "http://ldt.iri.centrepompidou.fr/new/uri") + .param("color", "#ffffff") + .param("avatar", "A pretty avatar"); + + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.view().name("admin/groupEdit")) + .andExpect(MockMvcResultMatchers.model().hasErrors()) + .andExpect(MockMvcResultMatchers.model().errorCount(1)) + .andExpect(MockMvcResultMatchers.model().attributeHasErrors("group")) + .andExpect(MockMvcResultMatchers.model().attributeHasFieldErrors("group", "title")); + + Assert.assertEquals("Must not have one more group", GROUP_NB,this.groupsRepository.count()); + + } + + @Test + public void testUserPostCreateBadPassword() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/users/save") + .param("title", "user") + .param("description", "New description") + .param("uri", "http://ldt.iri.centrepompidou.fr/new/uri") + .param("color", "#ffffff") + .param("expirationDate","2007-11-24") + .param("credentialsExpirationDate","2009-11-29") + .param("password", "test") + .param("passwordConfirm", "test2"); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.view().name("admin/userEdit")) + .andExpect(MockMvcResultMatchers.model().hasErrors()) + .andExpect(MockMvcResultMatchers.model().errorCount(1)) + .andExpect(MockMvcResultMatchers.model().attributeHasErrors("user")) + .andExpect(MockMvcResultMatchers.model().attributeHasFieldErrors("user", "password")); + + Assert.assertEquals("Must not have one more user", USER_NB,this.usersRepository.count()); + + } + + + @Test + public void testDeleteGroup() throws Exception { + + MockHttpServletRequestBuilder get = MockMvcRequestBuilders + .get("/admin/groups/delete/" + + this.groupsUuids.get(GROUP_NB - 1)); + + MvcResult res = this.mvc + .perform(get) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect( + MockMvcResultMatchers.view().name( + "admin/groupDeleteConfirm")) + .andExpect( + MockMvcResultMatchers.model().attributeExists( + "groupObj", "key", "salt")).andReturn(); + + Map model = res.getModelAndView().getModel(); + + Group group = (Group) model.get("groupObj"); + Assert.assertNotNull("Group is not null", group); + Assert.assertEquals("Must be first group id", + this.groupsUuids.get(GROUP_NB - 1), group.getId()); + + String key = (String) model.get("key"); + Assert.assertNotNull("key is not null", key); + + String salt = (String) model.get("salt"); + Assert.assertNotNull("salt is not null", salt); + + Assert.assertTrue("Key must be checked", group.checkKey(key, salt)); + + } + + @Test + public void testDeleteFakeGroup() throws Exception { + + MockHttpServletRequestBuilder get = MockMvcRequestBuilders + .get("/admin/groups/delete/" + UUID.randomUUID().toString()); + + try { + this.mvc.perform(get).andExpect( + MockMvcResultMatchers.status().isNotFound()); + } catch (NestedServletException e) { + Assert.assertNotNull("Nested exception must not be null", + e.getCause()); + Assert.assertEquals( + "Inner exception must be a HttpClientErrorException", + HttpClientErrorException.class, e.getCause().getClass()); + Assert.assertEquals("Exception error status must be not found", + HttpStatus.NOT_FOUND, + ((HttpClientErrorException) e.getCause()).getStatusCode()); + } + + } + + @Test + public void testDoDeleteGroupNoKey() throws Exception { + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/groups/delete/" + + this.spacesUuids.get(GROUP_NB - 1)); + + try { + this.mvc.perform(post).andExpect( + MockMvcResultMatchers.status().isBadRequest()); + } catch (NestedServletException e) { + Assert.assertNotNull("Nested exception must not be null", + e.getCause()); + Assert.assertEquals( + "Inner exception must be a HttpClientErrorException", + HttpClientErrorException.class, e.getCause().getClass()); + Assert.assertEquals("Exception error status must be not found", + HttpStatus.BAD_REQUEST, + ((HttpClientErrorException) e.getCause()).getStatusCode()); + } + + Assert.assertEquals("Must have same nb of group", GROUP_NB, + this.groupsRepository.count()); + + } + + @Test + public void testDoDeleteGroup() throws Exception { + + Group group = this.groupsList.get(this.groupsUuids.get(GROUP_NB - 1)); + + SecureRandom rand = SecureRandom.getInstance("SHA1PRNG"); + rand.setSeed(System.currentTimeMillis()); + byte[] rawSalt = new byte[50]; + rand.nextBytes(rawSalt); + String salt = Hex.encodeHexString(rawSalt); + String key = group.getKey(salt); + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post(String + .format("/admin/groups/delete/%s?key=%s&salt=%s", + this.groupsUuids.get(GROUP_NB - 1), key, salt)); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isSeeOther()) + .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/groups")); + + Assert.assertEquals("Must have one less space", GROUP_NB - 1, + this.groupsRepository.count()); + + group = this.groupsRepository.findOne(this.groupsUuids + .get(GROUP_NB - 1)); + + Assert.assertNull("Group " + this.groupsUuids.get(GROUP_NB - 1) + + " deleted", group); + + } + + @Test + public void testDoDeleteGroupFake() throws Exception { + + Group group = this.groupsList.get(this.groupsUuids.get(GROUP_NB - 1)); + + SecureRandom rand = SecureRandom.getInstance("SHA1PRNG"); + rand.setSeed(System.currentTimeMillis()); + byte[] rawSalt = new byte[50]; + rand.nextBytes(rawSalt); + String salt = Hex.encodeHexString(rawSalt); + String key = group.getKey(salt); + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post(String + .format("/admin/groups/delete/%s?key=%s&salt=%s", + UUID.randomUUID(), key, salt)); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isSeeOther()) + .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/groups")); + + Assert.assertEquals("Must have the same nb of group", GROUP_NB, + this.groupsRepository.count()); + + } + + @Test + public void testUpdateUserGroups() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/groups/save"); + post = post.param("id", this.groupsUuids.get(0)); + post = post.param("title", "New name"); + post = post.param("description", "New description"); + post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); + post = post.param("color", "#ffffff"); + post = post.param("users", this.usersUuids.toArray(new String[GroupsAdminControllerTest.GROUP_NB])); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isSeeOther()) + .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/groups")); + + Group group = this.groupsRepository.findOne(this.groupsUuids.get(0)); + + Assert.assertNotNull("Should find group", group); + Assert.assertEquals("Title equals", "New name", group.getTitle()); + Assert.assertEquals("Description equals", "New description", + group.getDescription()); + Assert.assertEquals("Uri equals", + "http://ldt.iri.centrepompidou.fr/new/uri", group.getUri()); + Assert.assertEquals("Color equals", "#ffffff", group.getColor()); + + Assert.assertNotNull("Users must be set", group.getUsers()); + Assert.assertEquals("all users must be set", USER_NB, group.getUsers().size()); + Assert.assertTrue("users list must contains all users", this.usersUuids.containsAll(group.getUsers())); + + } + + +} diff -r 2e738512336a -r 18a43ba77ad0 server/src/test/java/org/iri_research/renkan/test/controller/SpacesAdminControllerTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/test/java/org/iri_research/renkan/test/controller/SpacesAdminControllerTest.java Wed Jan 15 18:36:27 2014 +0100 @@ -0,0 +1,557 @@ +package org.iri_research.renkan.test.controller; + +import java.security.SecureRandom; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TimeZone; +import java.util.UUID; + +import org.apache.commons.codec.binary.Hex; +import org.iri_research.renkan.models.Project; +import org.iri_research.renkan.models.Space; +import org.iri_research.renkan.repositories.ProjectsRepository; +import org.iri_research.renkan.repositories.SpacesRepository; +import org.joda.time.DateTime; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.util.NestedServletException; + +@RunWith(SpringJUnit4ClassRunner.class) +@WebAppConfiguration +@ContextConfiguration(locations = { "controller-context.xml", + "file:src/main/webapp/WEB-INF/spring-servlet.xml" }) +public class SpacesAdminControllerTest { + + private final static int SPACE_NB = 3; + + private Logger logger = LoggerFactory.getLogger(SpacesAdminControllerTest.class); + + @Autowired + private SpacesRepository spacesRepository; + @Autowired + private ProjectsRepository projectsRepository; + + private Map spacesList = new HashMap(SPACE_NB); + private List spacesUuids = new ArrayList<>(SPACE_NB); + + private ArrayList testProjects = new ArrayList(); + + @Autowired + private WebApplicationContext context; + private MockMvc mvc; + + @Before + public void setup() { + + logger.debug("Setup"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + spacesRepository.deleteAll(); + projectsRepository.deleteAll(); + + ArrayList pl = new ArrayList(); + for (int i = 0; i < SPACE_NB; i++) { + DateTime creationDate = new DateTime(); + String uuid = UUID.randomUUID().toString(); + spacesUuids.add(uuid); + Space testSpace = new Space(uuid, "test " + i, "Test space " + 1, + "{}", "http://ldt.iri.centrepompidou.fr", "#ababab", + "test_user", "http://ldt.iri.centrepompidou.fr", + creationDate); + testSpace = spacesRepository.save(testSpace); + this.spacesList.put(uuid, testSpace); + for (int j = 0; j < SPACE_NB - 1 - i; j++) { + pl.add(new Project(testSpace.getId(), UUID.randomUUID() + .toString(), "test" + ((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), creationDate)); + } + try { + Thread.sleep(1); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + for (Project p : projectsRepository.save(pl)) { + this.testProjects.add(p); + } + + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).build(); + } + + @After + public void teardown() { + spacesRepository.deleteAll(); + projectsRepository.deleteAll(); + } + + @Test + public void testSpacePostUpdate() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/spaces/save"); + post = post.param("id", this.spacesUuids.get(0)); + post = post.param("title", "New title"); + post = post.param("description", "New description"); + post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); + post = post.param("color", "#ffffff"); + post = post.param("binConfig", "{}"); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isSeeOther()) + .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/spaces")); + + Space sp = this.spacesRepository.findOne(this.spacesUuids.get(0)); + + Assert.assertNotNull("Should find space", sp); + Assert.assertEquals("Title equals", "New title", sp.getTitle()); + Assert.assertEquals("Description equals", "New description", + sp.getDescription()); + Assert.assertEquals("Uri equals", + "http://ldt.iri.centrepompidou.fr/new/uri", sp.getUri()); + Assert.assertEquals("Color equals", "#ffffff", sp.getColor()); + Assert.assertEquals("BinConfig equals", "{}", sp.getBinConfig()); + + } + + @Test + public void testSpacePostCreate() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/spaces/save"); + post = post.param("title", "New title"); + post = post.param("description", "New description"); + post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); + post = post.param("color", "#ffffff"); + post = post.param("binConfig", "{}"); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isSeeOther()) + .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/spaces")); + + Assert.assertEquals("Must have one more space", SPACE_NB + 1, + this.spacesRepository.count()); + + for (Space sp : this.spacesRepository.findAll()) { + if (this.spacesList.containsKey(sp.getId())) { + continue; + } else { + Assert.assertNotNull("Should find space", sp); + Assert.assertEquals("Title equals", "New title", sp.getTitle()); + Assert.assertEquals("Description equals", "New description", + sp.getDescription()); + Assert.assertEquals("Uri equals", + "http://ldt.iri.centrepompidou.fr/new/uri", sp.getUri()); + Assert.assertEquals("Color equals", "#ffffff", sp.getColor()); + Assert.assertEquals("BinConfig equals", "{}", sp.getBinConfig()); + Assert.assertTrue( + "id sould match uuid regex", + sp.getId() + .matches( + "[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}")); + Assert.assertNotNull("Date created should be not null", + sp.getCreated()); + } + } + } + + @Test + public void testSpacePostUpdateEmptyTitle() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/spaces/save"); + post = post.param("id", this.spacesUuids.get(0)); + post = post.param("title", ""); + post = post.param("description", "New description"); + post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); + post = post.param("color", "#ffffff"); + post = post.param("binConfig", "{}"); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.view().name("admin/spaceEdit")) + .andExpect(MockMvcResultMatchers.model().hasErrors()) + .andExpect(MockMvcResultMatchers.model().errorCount(1)) + .andExpect( + MockMvcResultMatchers.model().attributeHasErrors( + "space")) + .andExpect( + MockMvcResultMatchers.model().attributeHasFieldErrors( + "space", "title")); + + Space sp = this.spacesRepository.findOne(this.spacesUuids.get(0)); + + Assert.assertNotNull("Should find space", sp); + Assert.assertEquals("Title equals", "test 0", sp.getTitle()); + + } + + @Test + public void testSpacePostCreateEmptyTitle() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/spaces/save"); + post = post.param("title", ""); + post = post.param("description", "New description"); + post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); + post = post.param("color", "#ffffff"); + post = post.param("binConfig", "{}"); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.view().name("admin/spaceEdit")) + .andExpect(MockMvcResultMatchers.model().hasErrors()) + .andExpect(MockMvcResultMatchers.model().errorCount(1)) + .andExpect( + MockMvcResultMatchers.model().attributeHasErrors( + "space")) + .andExpect( + MockMvcResultMatchers.model().attributeHasFieldErrors( + "space", "title")); + + Assert.assertEquals("Must not have one more space", SPACE_NB, + this.spacesRepository.count()); + + } + + @Test + public void testSpacePostUpdateBadJson() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/spaces/save"); + post = post.param("id", this.spacesUuids.get(0)); + post = post.param("title", "New Title"); + post = post.param("description", "New description"); + post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); + post = post.param("color", "#ffffff"); + post = post.param("binConfig", "{"); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.view().name("admin/spaceEdit")) + .andExpect(MockMvcResultMatchers.model().hasErrors()) + .andExpect(MockMvcResultMatchers.model().errorCount(1)) + .andExpect( + MockMvcResultMatchers.model().attributeHasErrors( + "space")) + .andExpect( + MockMvcResultMatchers.model().attributeHasFieldErrors( + "space", "binConfig")); + + Space sp = this.spacesRepository.findOne(this.spacesUuids.get(0)); + + Assert.assertNotNull("Should find space", sp); + Assert.assertEquals("Bin config equals", "{}", sp.getBinConfig()); + + } + + @Test + public void testSpacePostCreateBadJson() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/spaces/save"); + post = post.param("title", "New Title"); + post = post.param("description", "New description"); + post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); + post = post.param("color", "#ffffff"); + post = post.param("binConfig", "}"); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.view().name("admin/spaceEdit")) + .andExpect(MockMvcResultMatchers.model().hasErrors()) + .andExpect(MockMvcResultMatchers.model().errorCount(1)) + .andExpect( + MockMvcResultMatchers.model().attributeHasErrors( + "space")) + .andExpect( + MockMvcResultMatchers.model().attributeHasFieldErrors( + "space", "binConfig")); + + Assert.assertEquals("Must not have one more space", SPACE_NB, + this.spacesRepository.count()); + + } + + @Test + public void testSpacePostUpdateAllErrors() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/spaces/save"); + post = post.param("id", this.spacesUuids.get(0)); + post = post.param("title", ""); + post = post.param("description", "New description"); + post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); + post = post.param("color", "#ffffff"); + post = post.param("binConfig", "{"); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.view().name("admin/spaceEdit")) + .andExpect(MockMvcResultMatchers.model().hasErrors()) + .andExpect(MockMvcResultMatchers.model().errorCount(2)) + .andExpect( + MockMvcResultMatchers.model().attributeHasErrors( + "space")) + .andExpect( + MockMvcResultMatchers.model().attributeHasFieldErrors( + "space", "title")) + .andExpect( + MockMvcResultMatchers.model().attributeHasFieldErrors( + "space", "binConfig")); + + Space sp = this.spacesRepository.findOne(this.spacesUuids.get(0)); + + Assert.assertNotNull("Should find space", sp); + Assert.assertEquals("Bin config equals", "{}", sp.getBinConfig()); + Assert.assertEquals("title equals", "test 0", sp.getTitle()); + + } + + @Test + public void testSpacePostCreateAllErrors() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/spaces/save"); + post = post.param("title", ""); + post = post.param("description", "New description"); + post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); + post = post.param("color", "#ffffff"); + post = post.param("binConfig", "}"); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.view().name("admin/spaceEdit")) + .andExpect(MockMvcResultMatchers.model().hasErrors()) + .andExpect(MockMvcResultMatchers.model().errorCount(2)) + .andExpect( + MockMvcResultMatchers.model().attributeHasErrors( + "space")) + .andExpect( + MockMvcResultMatchers.model().attributeHasFieldErrors( + "space", "title")) + .andExpect( + MockMvcResultMatchers.model().attributeHasFieldErrors( + "space", "binConfig")); + + Assert.assertEquals("Must not have one more space", SPACE_NB, + this.spacesRepository.count()); + + } + + @Test + public void testDeleteSpace() throws Exception { + + MockHttpServletRequestBuilder get = MockMvcRequestBuilders + .get("/admin/spaces/delete/" + + this.spacesUuids.get(SPACE_NB - 1)); + + MvcResult res = this.mvc + .perform(get) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect( + MockMvcResultMatchers.view().name( + "admin/spaceDeleteConfirm")) + .andExpect( + MockMvcResultMatchers.model().attributeExists( + "spaceObj", "key", "salt")).andReturn(); + + Map model = res.getModelAndView().getModel(); + + Space space = (Space) model.get("spaceObj"); + Assert.assertNotNull("Space is not null", space); + Assert.assertEquals("Must be first space id", + this.spacesUuids.get(SPACE_NB - 1), space.getId()); + + String key = (String) model.get("key"); + Assert.assertNotNull("key is not null", key); + + String salt = (String) model.get("salt"); + Assert.assertNotNull("salt is not null", salt); + + Assert.assertTrue("Key must be checked", space.checkKey(key, salt)); + + } + + @Test + public void testDeleteFakeSpace() throws Exception { + + MockHttpServletRequestBuilder get = MockMvcRequestBuilders + .get("/admin/spaces/delete/" + UUID.randomUUID().toString()); + + try { + this.mvc.perform(get).andExpect( + MockMvcResultMatchers.status().isNotFound()); + } catch (NestedServletException e) { + Assert.assertNotNull("Nested exception must not be null", + e.getCause()); + Assert.assertEquals( + "Inner exception must be a HttpClientErrorException", + HttpClientErrorException.class, e.getCause().getClass()); + Assert.assertEquals("Exception error status must be not found", + HttpStatus.NOT_FOUND, + ((HttpClientErrorException) e.getCause()).getStatusCode()); + } + + } + + @Test + public void testDeleteSpaceProject() throws Exception { + + MockHttpServletRequestBuilder get = MockMvcRequestBuilders + .get("/admin/spaces/delete/" + this.spacesUuids.get(0)); + + try { + this.mvc.perform(get).andExpect( + MockMvcResultMatchers.status().isBadRequest()); + } catch (NestedServletException e) { + Assert.assertNotNull("Nested exception must not be null", + e.getCause()); + Assert.assertEquals( + "Inner exception must be a HttpClientErrorException", + HttpClientErrorException.class, e.getCause().getClass()); + Assert.assertEquals("Exception error status must be not found", + HttpStatus.BAD_REQUEST, + ((HttpClientErrorException) e.getCause()).getStatusCode()); + } + + } + + @Test + public void testDoDeleteSpaceNoKey() throws Exception { + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/spaces/delete/" + + this.spacesUuids.get(SPACE_NB - 1)); + + try { + this.mvc.perform(post).andExpect( + MockMvcResultMatchers.status().isBadRequest()); + } catch (NestedServletException e) { + Assert.assertNotNull("Nested exception must not be null", + e.getCause()); + Assert.assertEquals( + "Inner exception must be a HttpClientErrorException", + HttpClientErrorException.class, e.getCause().getClass()); + Assert.assertEquals("Exception error status must be not found", + HttpStatus.BAD_REQUEST, + ((HttpClientErrorException) e.getCause()).getStatusCode()); + } + + Assert.assertEquals("Must have same nb of space", SPACE_NB, + this.spacesRepository.count()); + + } + + @Test + public void testDoDeleteSpace() throws Exception { + + Space space = this.spacesList.get(this.spacesUuids.get(SPACE_NB - 1)); + + SecureRandom rand = SecureRandom.getInstance("SHA1PRNG"); + rand.setSeed(System.currentTimeMillis()); + byte[] rawSalt = new byte[50]; + rand.nextBytes(rawSalt); + String salt = Hex.encodeHexString(rawSalt); + String key = space.getKey(salt); + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post(String + .format("/admin/spaces/delete/%s?key=%s&salt=%s", + this.spacesUuids.get(SPACE_NB - 1), key, salt)); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isSeeOther()) + .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/spaces")); + + Assert.assertEquals("Must have one less space", SPACE_NB - 1, + this.spacesRepository.count()); + + space = this.spacesRepository.findOne(this.spacesUuids + .get(SPACE_NB - 1)); + + Assert.assertNull("Space " + this.spacesUuids.get(SPACE_NB - 1) + + " deleted", space); + + } + + @Test + public void testDoDeleteSpaceFake() throws Exception { + + Space space = this.spacesList.get(this.spacesUuids.get(SPACE_NB - 1)); + + SecureRandom rand = SecureRandom.getInstance("SHA1PRNG"); + rand.setSeed(System.currentTimeMillis()); + byte[] rawSalt = new byte[50]; + rand.nextBytes(rawSalt); + String salt = Hex.encodeHexString(rawSalt); + String key = space.getKey(salt); + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post(String + .format("/admin/spaces/delete/%s?key=%s&salt=%s", + UUID.randomUUID(), key, salt)); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isSeeOther()) + .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/spaces")); + + Assert.assertEquals("Must have the same nb of space", SPACE_NB, + this.spacesRepository.count()); + + } + + @Test + public void testDoDeleteSpaceProject() throws Exception { + + Space space = this.spacesList.get(this.spacesUuids.get(0)); + + SecureRandom rand = SecureRandom.getInstance("SHA1PRNG"); + rand.setSeed(System.currentTimeMillis()); + byte[] rawSalt = new byte[50]; + rand.nextBytes(rawSalt); + String salt = Hex.encodeHexString(rawSalt); + String key = space.getKey(salt); + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post(String + .format("/admin/spaces/delete/%s?key=%s&salt=%s", + this.spacesUuids.get(0), key, salt)); + + try { + this.mvc.perform(post).andExpect( + MockMvcResultMatchers.status().isBadRequest()); + } catch (NestedServletException e) { + Assert.assertNotNull("Nested exception must not be null", + e.getCause()); + Assert.assertEquals( + "Inner exception must be a HttpClientErrorException", + HttpClientErrorException.class, e.getCause().getClass()); + Assert.assertEquals("Exception error status must be not found", + HttpStatus.BAD_REQUEST, + ((HttpClientErrorException) e.getCause()).getStatusCode()); + } + + Assert.assertEquals("Must have the same nb of space", SPACE_NB, + this.spacesRepository.count()); + + } + +} diff -r 2e738512336a -r 18a43ba77ad0 server/src/test/java/org/iri_research/renkan/test/controller/UsersAdminControllerTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/test/java/org/iri_research/renkan/test/controller/UsersAdminControllerTest.java Wed Jan 15 18:36:27 2014 +0100 @@ -0,0 +1,549 @@ +package org.iri_research.renkan.test.controller; + +import java.security.SecureRandom; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TimeZone; +import java.util.UUID; + +import org.apache.commons.codec.binary.Hex; +import org.iri_research.renkan.models.Group; +import org.iri_research.renkan.models.Project; +import org.iri_research.renkan.models.Space; +import org.iri_research.renkan.models.User; +import org.iri_research.renkan.repositories.GroupsRepository; +import org.iri_research.renkan.repositories.ProjectsRepository; +import org.iri_research.renkan.repositories.SpacesRepository; +import org.iri_research.renkan.repositories.UsersRepository; +import org.joda.time.DateTime; +import org.joda.time.LocalDate; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.client.HttpClientErrorException; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.util.NestedServletException; + + +@RunWith(SpringJUnit4ClassRunner.class) +@WebAppConfiguration +@ContextConfiguration(locations = { "controller-context.xml", + "file:src/main/webapp/WEB-INF/spring-servlet.xml" }) +public class UsersAdminControllerTest { + + private final static int SPACE_NB = 3; + private final static int USER_NB = 3; + private final static int GROUP_NB = 4; + + private Logger logger = LoggerFactory.getLogger(UsersAdminControllerTest.class); + + @Autowired + private SpacesRepository spacesRepository; + @Autowired + private ProjectsRepository projectsRepository; + @Autowired + private UsersRepository usersRepository; + @Autowired + private GroupsRepository groupsRepository; + + + @Autowired + private PasswordEncoder renkanPasswordEncoder; + + private Map spacesList = new HashMap(SPACE_NB); + private List spacesUuids = new ArrayList<>(SPACE_NB); + + private ArrayList testProjects = new ArrayList(); + + private Map usersList = new HashMap(USER_NB); + private List usersUuids = new ArrayList<>(USER_NB); + + private Map groupsList = new HashMap(GROUP_NB); + private List groupsUuids = new ArrayList<>(GROUP_NB); + + @Autowired + private WebApplicationContext context; + private MockMvc mvc; + + @Before + public void setup() { + + logger.debug("Setup"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + spacesRepository.deleteAll(); + projectsRepository.deleteAll(); + usersRepository.deleteAll(); + + for(int i=0; i < USER_NB; i++) { + String uuid = UUID.randomUUID().toString(); + User user = new User(uuid, "user" + i, "User nb " + i, "http://www.iri.centrepompidou.fr", "#ababab"); + user.setLocked(false); + user.setEnabled(true); + user.setAvatar("A pretty picture"); + user.setExpirationDate(new LocalDate()); + user.setCredentialsExpirationDate(new LocalDate()); + user.setEmail(String.format("user%d@mail.com", i)); + user = usersRepository.save(user); + this.usersUuids.add(uuid); + this.usersList.put(uuid, user); + } + + for(int i=0; i < GROUP_NB; i++) { + String uuid = UUID.randomUUID().toString(); + Group group = new Group(uuid, "group" + i, "Group nb " + i, "http://www.iri.centrepompidou.fr/group/"+uuid, "#ababab"); + group.setAvatar("A pretty group picture " + i); + group = groupsRepository.save(group); + this.groupsUuids.add(uuid); + this.groupsList.put(uuid, group); + try { + Thread.sleep(1); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + } + + ArrayList pl = new ArrayList(); + for (int i = 0; i < SPACE_NB; i++) { + DateTime creationDate = new DateTime(); + String uuid = UUID.randomUUID().toString(); + spacesUuids.add(uuid); + Space testSpace = new Space(uuid, "test " + i, "Test space " + 1, + "{}", "http://ldt.iri.centrepompidou.fr", "#ababab", + "test_user", "http://ldt.iri.centrepompidou.fr", + creationDate); + testSpace = spacesRepository.save(testSpace); + this.spacesList.put(uuid, testSpace); + for (int j = 0; j < SPACE_NB - 1 - i; j++) { + Project p = new Project(testSpace.getId(), UUID.randomUUID() + .toString(), "test" + ((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), creationDate); + p.addUser(this.usersList.get(this.usersUuids.get(0))); + pl.add(p); + } + try { + Thread.sleep(1); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + for (Project p : projectsRepository.save(pl)) { + this.testProjects.add(p); + } + + + + this.mvc = MockMvcBuilders.webAppContextSetup(this.context).build(); + } + + @After + public void teardown() { + spacesRepository.deleteAll(); + projectsRepository.deleteAll(); + usersRepository.deleteAll(); + } + + @Test + public void testUserPostUpdate() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/users/save"); + post = post.param("id", this.usersUuids.get(0)); + post = post.param("title", "New name"); + post = post.param("description", "New description"); + post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); + post = post.param("color", "#ffffff"); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isSeeOther()) + .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/users")); + + User user = this.usersRepository.findOne(this.usersUuids.get(0)); + + Assert.assertNotNull("Should find user", user); + Assert.assertEquals("Title equals", "New name", user.getTitle()); + Assert.assertEquals("Description equals", "New description", + user.getDescription()); + Assert.assertEquals("Uri equals", + "http://ldt.iri.centrepompidou.fr/new/uri", user.getUri()); + Assert.assertEquals("Color equals", "#ffffff", user.getColor()); + } + + @Test + public void testUserPostCreate() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/users/save") + .param("title", "New name") + .param("description", "New description") + .param("uri", "http://ldt.iri.centrepompidou.fr/new/uri") + .param("color", "#ffffff") + .param("expirationDate","2007-11-24") + .param("credentialsExpirationDate","2009-11-29") + .param("password", "test") + .param("passwordConfirm", "test"); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isSeeOther()) + .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/users")); + + Assert.assertEquals("Must have one more space", USER_NB + 1, + this.usersRepository.count()); + + for (User user : this.usersRepository.findAll()) { + if (this.usersList.containsKey(user.getId())) { + continue; + } + else { + Assert.assertNotNull("Should find user", user); + Assert.assertEquals("Title equals", "New name", user.getTitle()); + Assert.assertEquals("Description equals", "New description", + user.getDescription()); + Assert.assertEquals("Uri equals", + "http://ldt.iri.centrepompidou.fr/new/uri", user.getUri()); + Assert.assertEquals("Color equals", "#ffffff", user.getColor()); + Assert.assertTrue( + "id sould match uuid regex", + user.getId() + .matches( + "[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}")); + Assert.assertTrue("password must match \"test\"", renkanPasswordEncoder.matches("test", user.getPassword())); + Assert.assertEquals(new LocalDate(2007, 11, 24), user.getExpirationDate()); + } + } + } + + @Test + public void testUserPostUpdateEmptyTitle() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/users/save") + .param("id", this.usersUuids.get(0)) + .param("title", "") + .param("description", "New description") + .param("uri", "http://ldt.iri.centrepompidou.fr/new/uri") + .param("color", "#ffffff") + .param("expirationDate","2007-11-24") + .param("credentialsExpirationDate","2009-11-29") + .param("password", "test") + .param("passwordConfirm", "test"); + + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.view().name("admin/userEdit")) + .andExpect(MockMvcResultMatchers.model().hasErrors()) + .andExpect(MockMvcResultMatchers.model().errorCount(1)) + .andExpect(MockMvcResultMatchers.model().attributeHasErrors("user")) + .andExpect(MockMvcResultMatchers.model().attributeHasFieldErrors("user", "title")); + + User user = this.usersRepository.findOne(this.usersUuids.get(0)); + + Assert.assertNotNull("Should find user", user); + Assert.assertEquals("name equals", "user0", user.getTitle()); + + Assert.assertEquals("name equals", "User nb 0", user.getDescription()); + + } + + @Test + public void testUserPostCreateEmptyName() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/users/save") + .param("title", "") + .param("description", "New description") + .param("uri", "http://ldt.iri.centrepompidou.fr/new/uri") + .param("color", "#ffffff") + .param("expirationDate","2007-11-24") + .param("credentialsExpirationDate","2009-11-29") + .param("password", "test") + .param("passwordConfirm", "test"); + + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.view().name("admin/userEdit")) + .andExpect(MockMvcResultMatchers.model().hasErrors()) + .andExpect(MockMvcResultMatchers.model().errorCount(1)) + .andExpect(MockMvcResultMatchers.model().attributeHasErrors("user")) + .andExpect(MockMvcResultMatchers.model().attributeHasFieldErrors("user", "title")); + + Assert.assertEquals("Must not have one more user", USER_NB,this.usersRepository.count()); + + } + + @Test + public void testUserPostCreateBadPassword() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/users/save") + .param("title", "user") + .param("description", "New description") + .param("uri", "http://ldt.iri.centrepompidou.fr/new/uri") + .param("color", "#ffffff") + .param("expirationDate","2007-11-24") + .param("credentialsExpirationDate","2009-11-29") + .param("password", "test") + .param("passwordConfirm", "test2"); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect(MockMvcResultMatchers.view().name("admin/userEdit")) + .andExpect(MockMvcResultMatchers.model().hasErrors()) + .andExpect(MockMvcResultMatchers.model().errorCount(1)) + .andExpect(MockMvcResultMatchers.model().attributeHasErrors("user")) + .andExpect(MockMvcResultMatchers.model().attributeHasFieldErrors("user", "password")); + + Assert.assertEquals("Must not have one more user", USER_NB,this.usersRepository.count()); + + } + + @Test + public void testDeleteUser() throws Exception { + + MockHttpServletRequestBuilder get = MockMvcRequestBuilders + .get("/admin/users/delete/" + + this.usersUuids.get(USER_NB - 1)); + + MvcResult res = this.mvc + .perform(get) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andExpect( + MockMvcResultMatchers.view().name( + "admin/userDeleteConfirm")) + .andExpect( + MockMvcResultMatchers.model().attributeExists( + "userObj", "key", "salt")).andReturn(); + + Map model = res.getModelAndView().getModel(); + + User user = (User) model.get("userObj"); + Assert.assertNotNull("User is not null", user); + Assert.assertEquals("Must be first user id", + this.usersUuids.get(USER_NB - 1), user.getId()); + + String key = (String) model.get("key"); + Assert.assertNotNull("key is not null", key); + + String salt = (String) model.get("salt"); + Assert.assertNotNull("salt is not null", salt); + + Assert.assertTrue("Key must be checked", user.checkKey(key, salt)); + + } + + @Test + public void testDeleteFakeUser() throws Exception { + + MockHttpServletRequestBuilder get = MockMvcRequestBuilders + .get("/admin/users/delete/" + UUID.randomUUID().toString()); + + try { + this.mvc.perform(get).andExpect( + MockMvcResultMatchers.status().isNotFound()); + } catch (NestedServletException e) { + Assert.assertNotNull("Nested exception must not be null", + e.getCause()); + Assert.assertEquals( + "Inner exception must be a HttpClientErrorException", + HttpClientErrorException.class, e.getCause().getClass()); + Assert.assertEquals("Exception error status must be not found", + HttpStatus.NOT_FOUND, + ((HttpClientErrorException) e.getCause()).getStatusCode()); + } + + } + + @Test + public void testDeleteUserProject() throws Exception { + + MockHttpServletRequestBuilder get = MockMvcRequestBuilders + .get("/admin/users/delete/" + this.usersUuids.get(0)); + + try { + this.mvc.perform(get).andExpect( + MockMvcResultMatchers.status().isBadRequest()); + } catch (NestedServletException e) { + Assert.assertNotNull("Nested exception must not be null", + e.getCause()); + Assert.assertEquals( + "Inner exception must be a HttpClientErrorException", + HttpClientErrorException.class, e.getCause().getClass()); + Assert.assertEquals("Exception error status must be not found", + HttpStatus.BAD_REQUEST, + ((HttpClientErrorException) e.getCause()).getStatusCode()); + } + + } + + @Test + public void testDoDeleteUserNoKey() throws Exception { + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/users/delete/" + + this.usersUuids.get(USER_NB - 1)); + + try { + this.mvc.perform(post).andExpect( + MockMvcResultMatchers.status().isBadRequest()); + } catch (NestedServletException e) { + Assert.assertNotNull("Nested exception must not be null", + e.getCause()); + Assert.assertEquals( + "Inner exception must be a HttpClientErrorException", + HttpClientErrorException.class, e.getCause().getClass()); + Assert.assertEquals("Exception error status must be not found", + HttpStatus.BAD_REQUEST, + ((HttpClientErrorException) e.getCause()).getStatusCode()); + } + + Assert.assertEquals("Must have same nb of user", USER_NB, + this.usersRepository.count()); + + } + + @Test + public void testDoDeleteUser() throws Exception { + + User user = this.usersList.get(this.usersUuids.get(USER_NB - 1)); + + SecureRandom rand = SecureRandom.getInstance("SHA1PRNG"); + rand.setSeed(System.currentTimeMillis()); + byte[] rawSalt = new byte[50]; + rand.nextBytes(rawSalt); + String salt = Hex.encodeHexString(rawSalt); + String key = user.getKey(salt); + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post(String + .format("/admin/users/delete/%s?key=%s&salt=%s", + this.usersUuids.get(USER_NB - 1), key, salt)); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isSeeOther()) + .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/users")); + + Assert.assertEquals("Must have one less user", USER_NB - 1, + this.usersRepository.count()); + + user = this.usersRepository.findOne(this.usersUuids + .get(USER_NB - 1)); + + Assert.assertNull("User " + this.usersUuids.get(USER_NB - 1) + + " deleted", user); + + } + + @Test + public void testDoDeleteSpaceFake() throws Exception { + + User user = this.usersList.get(this.usersUuids.get(USER_NB - 1)); + + SecureRandom rand = SecureRandom.getInstance("SHA1PRNG"); + rand.setSeed(System.currentTimeMillis()); + byte[] rawSalt = new byte[50]; + rand.nextBytes(rawSalt); + String salt = Hex.encodeHexString(rawSalt); + String key = user.getKey(salt); + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post(String + .format("/admin/users/delete/%s?key=%s&salt=%s", + UUID.randomUUID(), key, salt)); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isSeeOther()) + .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/users")); + + Assert.assertEquals("Must have the same nb of user", USER_NB, + this.usersRepository.count()); + + } + + @Test + public void testDoDeleteUserProject() throws Exception { + + User user = this.usersList.get(this.usersUuids.get(0)); + + SecureRandom rand = SecureRandom.getInstance("SHA1PRNG"); + rand.setSeed(System.currentTimeMillis()); + byte[] rawSalt = new byte[50]; + rand.nextBytes(rawSalt); + String salt = Hex.encodeHexString(rawSalt); + String key = user.getKey(salt); + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders.post(String + .format("/admin/users/delete/%s?key=%s&salt=%s", + this.usersUuids.get(0), key, salt)); + + try { + this.mvc.perform(post).andExpect( + MockMvcResultMatchers.status().isBadRequest()); + } catch (NestedServletException e) { + Assert.assertNotNull("Nested exception must not be null", + e.getCause()); + Assert.assertEquals( + "Inner exception must be a HttpClientErrorException", + HttpClientErrorException.class, e.getCause().getClass()); + Assert.assertEquals("Exception error status must be not found", + HttpStatus.BAD_REQUEST, + ((HttpClientErrorException) e.getCause()).getStatusCode()); + } + + Assert.assertEquals("Must have the same nb of user", USER_NB, + this.usersRepository.count()); + + } + + @Test + public void testUpdateUserGroups() throws Exception { + + MockHttpServletRequestBuilder post = MockMvcRequestBuilders + .post("/admin/users/save"); + post = post.param("id", this.usersUuids.get(0)); + post = post.param("title", "New name"); + post = post.param("description", "New description"); + post = post.param("uri", "http://ldt.iri.centrepompidou.fr/new/uri"); + post = post.param("color", "#ffffff"); + post = post.param("groups", this.groupsUuids.toArray(new String[UsersAdminControllerTest.GROUP_NB])); + + this.mvc.perform(post) + .andExpect(MockMvcResultMatchers.status().isSeeOther()) + .andExpect(MockMvcResultMatchers.redirectedUrl("/admin/users")); + + User user = this.usersRepository.findOne(this.usersUuids.get(0)); + + Assert.assertNotNull("Should find user", user); + Assert.assertEquals("Title equals", "New name", user.getTitle()); + Assert.assertEquals("Description equals", "New description", + user.getDescription()); + Assert.assertEquals("Uri equals", + "http://ldt.iri.centrepompidou.fr/new/uri", user.getUri()); + Assert.assertEquals("Color equals", "#ffffff", user.getColor()); + + Assert.assertNotNull("Groups must be set", user.getGroups()); + Assert.assertEquals("all users must be set", GROUP_NB, user.getGroups().size()); + Assert.assertTrue("users list must contains all users", this.groupsUuids.containsAll(user.getGroups())); + + } + +} diff -r 2e738512336a -r 18a43ba77ad0 server/src/test/java/org/iri_research/renkan/test/repositories/GroupsRepositoryTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/test/java/org/iri_research/renkan/test/repositories/GroupsRepositoryTest.java Wed Jan 15 18:36:27 2014 +0100 @@ -0,0 +1,391 @@ +package org.iri_research.renkan.test.repositories; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.TimeZone; +import java.util.UUID; + +import org.iri_research.renkan.models.Group; +import org.iri_research.renkan.models.User; +import org.iri_research.renkan.repositories.GroupsRepository; +import org.iri_research.renkan.repositories.UsersRepository; +import org.joda.time.LocalDate; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import com.mongodb.DBCollection; +import com.mongodb.DBObject; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration("repositories-context.xml") +public class GroupsRepositoryTest { + + private final static int USER_NB = 3; + private final static int GROUP_NB = 3; + + private Logger logger = LoggerFactory.getLogger(GroupsRepositoryTest.class); + + @Autowired + private UsersRepository usersRepository; + @Autowired + private GroupsRepository groupsRepository; + + + @Autowired + private MongoTemplate mongoTemplate; + + private Map usersList = new HashMap(USER_NB); + private List usersUuids = new ArrayList<>(USER_NB); + + private Map groupsList = new HashMap(GROUP_NB); + private List groupsUuids = new ArrayList<>(GROUP_NB); + + + @Before + public void setup() { + + logger.debug("Setup"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + usersRepository.deleteAll(); + for(int i=0; i < USER_NB; i++) { + String uuid = UUID.randomUUID().toString(); + User user = new User(uuid, "user" + i, "User nb " + i, "http://www.iri.centrepompidou.fr", "#ababab"); + user.setLocked(false); + user.setEnabled(true); + user.setAvatar("A pretty picture"); + user.setExpirationDate(new LocalDate()); + user.setCredentialsExpirationDate(new LocalDate()); + user.setEmail(String.format("user%d@mail.com", i)); + user = usersRepository.save(user); + this.usersUuids.add(uuid); + this.usersList.put(uuid, user); + try { + Thread.sleep(1); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + for(int i=0; i < GROUP_NB; i++) { + String uuid = UUID.randomUUID().toString(); + Group group = new Group(uuid, "group" + i, "Group nb " + i, "http://www.iri.centrepompidou.fr/group/"+uuid, "#ababab"); + group.setAvatar("A pretty group picture " + i); + group = groupsRepository.save(group); + this.groupsUuids.add(uuid); + this.groupsList.put(uuid, group); + try { + Thread.sleep(1); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + } + + + } + + @Test + public void testGroupFieldMapping() { + // query json directly with mongodb driver + // check field values + DBCollection coll = mongoTemplate.getCollection(mongoTemplate + .getCollectionName(Group.class)); + + for (DBObject obj : coll.find()) { + Assert.assertTrue("mongo object must have _id field", + obj.containsField("_id")); + + String id = obj.get("_id").toString(); + + Group group = this.groupsList.get(id); + + Assert.assertTrue("mongo object must have title field", + obj.containsField("title")); + Assert.assertEquals("Titles must be the same", + group.getTitle(), obj.get("title")); + + Assert.assertTrue("mongo object must have description field", + obj.containsField("description")); + Assert.assertEquals("description must be the same", + group.getDescription(), obj.get("description")); + + Assert.assertTrue("mongo object must have color field", + obj.containsField("color")); + Assert.assertEquals("Color must be the same", group.getColor(), obj.get("color")); + + Assert.assertTrue("mongo object must have uri field", + obj.containsField("uri")); + Assert.assertEquals("Uri must be the same", group.getUri(), obj.get("uri")); + + Assert.assertTrue("mongo object must have avatar field", + obj.containsField("avatar")); + Assert.assertEquals("Avater must be the same", group.getAvatar(), obj.get("avatar")); + + } + } + + @Test + public void testSetUsersList() { + + Group group = this.groupsList.get(this.groupsUuids.get(0)); + + List userIds = this.usersUuids; + + this.groupsRepository.setUsersList(group, userIds); + + //reload user + group = this.groupsRepository.findOne(group.getId()); + + Assert.assertEquals("group user list is big enough", userIds.size(), group.getUsers().size()); + Assert.assertTrue("Group user list contains all users", group.getUsers().containsAll(userIds)); + + for (User u : this.usersRepository.findAll(userIds)) { + Assert.assertEquals(String.format("user list for user %s must be size 1", u.getId()), 1, u.getGroups().size()); + Assert.assertTrue(String.format("user list for group %s must contains user %s", u.getId(), group.getId()), u.getGroups().contains(group.getId())); + } + } + + + @Test + public void testAddUsersList() { + Group group = this.groupsList.get(this.groupsUuids.get(1)); + + List userIds = this.usersUuids.subList(0, 1); + this.groupsRepository.setUsersList(group, userIds); + + group = this.groupsRepository.findOne(group.getId()); + + Assert.assertEquals("group users is big enough", userIds.size(), group.getUsers().size()); + Assert.assertTrue("User list contains all user", group.getUsers().containsAll(userIds)); + + User user = this.usersRepository.findOne(userIds.get(0)); + Assert.assertEquals(String.format("group list for user %s must be size 1", user.getId()), 1, user.getGroups().size()); + Assert.assertTrue(String.format("group list for user %s must contains group %s", user.getId(), group.getId()), user.getGroups().contains(group.getId())); + + this.groupsRepository.setUsersList(group, this.usersUuids); + + //reload group + group = this.groupsRepository.findOne(group.getId()); + + Assert.assertEquals("group user list is big enough", this.usersUuids.size(), group.getUsers().size()); + Assert.assertTrue("User list contains all user", group.getUsers().containsAll(this.usersUuids)); + + for (User u : this.usersRepository.findAll(this.usersUuids)) { + Assert.assertEquals(String.format("group list for user %s must be size 1", u.getId()), 1, u.getGroups().size()); + Assert.assertTrue(String.format("group list for user %s must contains group %s", u.getId(), group.getId()), u.getGroups().contains(group.getId())); + } + + } + + @Test + public void testRemoveUsersList() { + Group group = this.groupsList.get(this.groupsUuids.get(2)); + + this.groupsRepository.setUsersList(group, this.usersUuids); + + //reload group + group = this.groupsRepository.findOne(group.getId()); + + Assert.assertEquals("Group user list is big enough", this.usersUuids.size(), group.getUsers().size()); + Assert.assertTrue("User list contains all user", group.getUsers().containsAll(this.usersUuids)); + + for(User user : this.usersRepository.findAll(this.usersUuids)) { + Assert.assertEquals(String.format("group list for user %s must be size 1", user.getId()), 1, user.getGroups().size()); + Assert.assertTrue(String.format("group list for user %s must contains group %s", user.getId(), group.getId()), user.getGroups().contains(group.getId())); + } + + this.groupsRepository.setUsersList(group, this.usersUuids.subList(USER_NB-1, USER_NB)); + + //reload group + group = this.groupsRepository.findOne(group.getId()); + + Assert.assertEquals("group user list is big enough", 1, group.getUsers().size()); + Assert.assertTrue("User list contains all user", group.getUsers().contains(this.usersUuids.get(USER_NB-1))); + + User u = this.usersRepository.findOne(this.usersUuids.get(USER_NB-1)); + Assert.assertEquals(String.format("group list for user %s must be size 1", u.getId()), 1, u.getGroups().size()); + Assert.assertTrue(String.format("group list for user %s must contains group %s", u.getId(), group.getId()), u.getGroups().contains(group.getId())); + + for(User otherUser: this.usersRepository.findAll(this.usersUuids.subList(0, USER_NB-2))) { + Assert.assertEquals(String.format("group list for user %s must be size 0", otherUser.getId()), 0, otherUser.getGroups().size()); + } + + } + + + @Test + public void testAddUsersListExisting() { + + // get first group + Group group = this.groupsList.get(this.groupsUuids.get(0)); + + List userIds = this.usersUuids; + + // set all users for first group + this.groupsRepository.setUsersList(group, userIds); + + //reload group + group = this.groupsRepository.findOne(group.getId()); + + //check that group has all users + Assert.assertEquals("Group user list is big enough", userIds.size(), group.getUsers().size()); + Assert.assertTrue("User list contains all user", group.getUsers().containsAll(userIds)); + + // and that users have all new group + for (User u : this.usersRepository.findAll(userIds)) { + Assert.assertEquals(String.format("Group list for user %s must be size 1", u.getId()), 1, u.getGroups().size()); + Assert.assertTrue(String.format("Group list for user %s must contains group %s", u.getId(), group.getId()), u.getGroups().contains(group.getId())); + } + + + // get second group + group = this.groupsList.get(this.groupsUuids.get(1)); + + //first set one user + List secondUserIds = this.usersUuids.subList(0, 1); + this.groupsRepository.setUsersList(group, secondUserIds); + + // reload group + group = this.groupsRepository.findOne(group.getId()); + + // check that second group has all users + Assert.assertEquals("Group user list is big enough", secondUserIds.size(), group.getUsers().size()); + Assert.assertTrue("User list contains all users", group.getUsers().containsAll(secondUserIds)); + + // check that group has new and old user + User user = this.usersRepository.findOne(secondUserIds.get(0)); + Assert.assertEquals(String.format("Group list for user %s must be size 2", user.getId()), 2, user.getGroups().size()); + Assert.assertTrue(String.format("Group list for user %s must contains group %s", user.getId(), group.getId()), user.getGroups().contains(group.getId())); + Assert.assertTrue(String.format("Group list for user %s must contains group %s", user.getId(), groupsUuids.get(0)), user.getGroups().contains(groupsUuids.get(0))); + + // set all new users list for second group + this.groupsRepository.setUsersList(group, this.usersUuids); + + //reload group + group = this.groupsRepository.findOne(group.getId()); + + //check that group 2 has all users + Assert.assertEquals("Group user list is big enough", this.usersUuids.size(), group.getUsers().size()); + Assert.assertTrue("User list contains all user", group.getUsers().containsAll(this.usersUuids)); + + // check that all users had group 1 and group 2 + for (User u : this.usersRepository.findAll(this.usersUuids)) { + Assert.assertEquals(String.format("Group list for user %s must be size 1", u.getId()), 2, u.getGroups().size()); + Assert.assertTrue(String.format("Group list for user %s must contains group %s", u.getId(), group.getId()), u.getGroups().contains(group.getId())); + Assert.assertTrue(String.format("Group list for user %s must contains group %s", u.getId(), groupsUuids.get(0)), u.getGroups().contains(groupsUuids.get(0))); + } + + } + + + @Test + public void testRemoveGroupListExisting() { + + // get first group + Group group = this.groupsList.get(this.groupsUuids.get(0)); + + List userIds = this.usersUuids; + + // set all users for first group + this.groupsRepository.setUsersList(group, userIds); + + //reload group + group = this.groupsRepository.findOne(group.getId()); + + //check that group has all users + Assert.assertEquals("Group users list is big enough", userIds.size(), group.getUsers().size()); + Assert.assertTrue("User list contains all user", group.getUsers().containsAll(userIds)); + + // and that users have all new group + for (User u : this.usersRepository.findAll(userIds)) { + Assert.assertEquals(String.format("Group list for user %s must be size 1", u.getId()), 1, u.getGroups().size()); + Assert.assertTrue(String.format("Group list for user %s must contains group %s", u.getId(), group.getId()), u.getGroups().contains(group.getId())); + } + + // get 3rd group + group = this.groupsList.get(this.groupsUuids.get(2)); + + // set all users for 3rd group + this.groupsRepository.setUsersList(group, this.usersUuids); + + //reload 3rd group + group = this.groupsRepository.findOne(group.getId()); + + //check that all users are set for 3rd group + Assert.assertEquals("Group users list is big enough", this.usersUuids.size(), group.getUsers().size()); + Assert.assertTrue("User list contains all users", group.getUsers().containsAll(this.usersUuids)); + + //check that all users has 3rd group and 1st group + for(User user : this.usersRepository.findAll(this.usersUuids)) { + Assert.assertEquals(String.format("Group list for user %s must be size 2", user.getId()), 2, user.getGroups().size()); + Assert.assertTrue(String.format("Group list for user %s must contains group %s", user.getId(), group.getId()), user.getGroups().contains(group.getId())); + Assert.assertTrue(String.format("Group list for user %s must contains group %s", user.getId(), this.groupsUuids.get(0)), user.getGroups().contains(this.groupsUuids.get(0))); + } + + //set new user list for 3rd group + this.groupsRepository.setUsersList(group, this.usersUuids.subList(USER_NB-1, USER_NB)); + + //reload 3rd group + group = this.groupsRepository.findOne(group.getId()); + + //check that 3rd group has only one user (last user) + Assert.assertEquals("Group users list is big enough", 1, group.getUsers().size()); + Assert.assertTrue("User list contains all users", group.getUsers().contains(this.usersUuids.get(USER_NB-1))); + + // check that last user has 3rd and 1rst group + User u = this.usersRepository.findOne(this.usersUuids.get(USER_NB-1)); + Assert.assertEquals(String.format("Group list for user %s must be size 1", u.getId()), 2, u.getGroups().size()); + Assert.assertTrue(String.format("Group list for user %s must contains group %s", u.getId(), group.getId()), u.getGroups().contains(group.getId())); + Assert.assertTrue(String.format("Group list for user %s must contains group %s", u.getId(), this.groupsUuids.get(0)), u.getGroups().contains(this.groupsUuids.get(0))); + + // check that other users has only 1rst group + for(User otherUser: this.usersRepository.findAll(this.usersUuids.subList(0, USER_NB-2))) { + Assert.assertEquals(String.format("Group list for user %s must be size 0", otherUser.getId()), 1, otherUser.getGroups().size()); + Assert.assertTrue(String.format("Group list for user %s must contains group %s", otherUser.getId(), this.groupsUuids.get(0)), otherUser.getGroups().contains(this.groupsUuids.get(0))); + } + + } + + @Test + public void testGetUsersMap() { + + Group group = this.groupsList.get(this.groupsUuids.get(0)); + + List userIds = this.usersUuids; + + this.groupsRepository.setUsersList(group, userIds); + + + Map usersMap = this.groupsRepository.getUsersMap(group); + + Assert.assertEquals ("user map should have same length than users list", this.usersUuids.size(), usersMap.size()); + Assert.assertTrue("user map should contains all uuids", this.usersUuids.containsAll(usersMap.keySet())); + for (Entry entry : usersMap.entrySet()) { + User user = entry.getValue(); + String userId = entry.getKey(); + Assert.assertTrue("user id in user uuid", this.usersUuids.contains(userId)); + Assert.assertEquals("key id and value user id must be the same", userId, user.getId()); + } + + } + + + @After + public void teardown() { + this.usersRepository.deleteAll(); + this.groupsRepository.deleteAll(); + } + +} diff -r 2e738512336a -r 18a43ba77ad0 server/src/test/java/org/iri_research/renkan/test/repositories/ProjectSyncsRepositoryTest.java --- a/server/src/test/java/org/iri_research/renkan/test/repositories/ProjectSyncsRepositoryTest.java Fri Oct 25 16:42:11 2013 +0200 +++ b/server/src/test/java/org/iri_research/renkan/test/repositories/ProjectSyncsRepositoryTest.java Wed Jan 15 18:36:27 2014 +0100 @@ -1,8 +1,7 @@ package org.iri_research.renkan.test.repositories; - import java.util.ArrayList; -import java.util.Date; +import java.util.TimeZone; import java.util.UUID; import org.iri_research.renkan.RenkanException; @@ -12,6 +11,7 @@ import org.iri_research.renkan.repositories.ProjectSyncsRepository; import org.iri_research.renkan.repositories.ProjectsRepository; import org.iri_research.renkan.repositories.SpacesRepository; +import org.joda.time.DateTime; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -23,143 +23,155 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("repositories-context.xml") public class ProjectSyncsRepositoryTest { - private Logger logger = LoggerFactory.getLogger(ProjectSyncsRepositoryTest.class); - - @Autowired - private ProjectsRepository projectRepository; + private Logger logger = LoggerFactory + .getLogger(ProjectSyncsRepositoryTest.class); + + @Autowired + private ProjectsRepository projectRepository; + + @Autowired + private ProjectSyncsRepository projectSyncsRepository; + + @Autowired + private SpacesRepository spacesRepository; + + private ArrayList testProjects = new ArrayList(); + + public ProjectSyncsRepositoryTest() { + } + + @Before + public void setup() { + + logger.debug("Setup"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + Space testSpace = new Space(UUID.randomUUID().toString(), "test", + "Test space", null, null, null, "test_user", null, null); + testSpace = spacesRepository.save(testSpace); + ArrayList pl = new ArrayList(); + pl.add(new Project(testSpace.getId(), null, "test1", "desc1", + "http://localhost:8080/rest/projects/id1", new DateTime())); + pl.add(new Project(testSpace.getId(), null, "test2", "desc2", + "http://localhost:8080/rest/projects/id2", new DateTime())); + logger.debug("Setup : new Project "); + for (Project p : projectRepository.save(pl)) { + this.testProjects.add(p); + } + } - @Autowired - private ProjectSyncsRepository projectSyncsRepository; - - @Autowired - private SpacesRepository spacesRepository; - - - private ArrayList testProjects = new ArrayList(); - - public ProjectSyncsRepositoryTest() { - } - - @Before - public void setup() { - - logger.debug("Setup"); - Space testSpace = new Space(UUID.randomUUID().toString(), "test", "Test space", null, null, null, "test_user", null, null); - testSpace = spacesRepository.save(testSpace); - ArrayList pl = new ArrayList(); - pl.add(new Project(testSpace.getId(), null, "test1", "desc1", "http://localhost:8080/rest/projects/id1", new Date())); - pl.add(new Project(testSpace.getId(), null, "test2", "desc2", "http://localhost:8080/rest/projects/id2", new Date())); - logger.debug("Setup : new Project "); - for(Project p: projectRepository.save(pl)) { - this.testProjects.add(p); - } - } - - @After - public void teardown() { - logger.debug("Teardown"); - projectRepository.deleteAll(); - projectSyncsRepository.deleteAll(); - } - + @After + public void teardown() { + logger.debug("Teardown"); + projectRepository.deleteAll(); + projectSyncsRepository.deleteAll(); + } + + @Test + public void testGetCollection() { + String collectionName = this.projectSyncsRepository.getCollection() + .getName(); + + Assert.assertEquals("The collection name should be projectSyncs", + "projectSyncs", collectionName); + + } + + @Test + public void testGetProjectSync() throws RenkanException { + + Project p = projectRepository.findOne(this.testProjects.get(0).getId()); + + String data = "{\"example\":\"this is an example\"}"; + + ProjectSync ps = projectSyncsRepository + .getProjectSync(data, p, "user1"); + + ps = this.projectSyncsRepository.save(ps); + + ps = this.projectSyncsRepository.findOne(ps.getId()); + + Assert.assertNotNull(ps); + Assert.assertEquals(data, ps.getData()); + + } - @Test - public void testGetCollection() { - String collectionName = this.projectSyncsRepository.getCollection().getName(); - - Assert.assertEquals("The collection name should be projectSyncs", "projectSyncs", collectionName); - - } - - @Test - public void testGetProjectSync() throws RenkanException { - - Project p = projectRepository.findOne(this.testProjects.get(0).getId()); - - String data = "{\"example\":\"this is an example\"}"; - - ProjectSync ps = projectSyncsRepository.getProjectSync(data, p, "user1"); - - ps = this.projectSyncsRepository.save(ps); - - - ps = this.projectSyncsRepository.findOne(ps.getId()); - - Assert.assertNotNull(ps); - Assert.assertEquals(data, ps.getData()); - - } - - - @Test - public void testGetProjectSyncRevision() throws RenkanException { - - Project p = projectRepository.findOne(this.testProjects.get(0).getId()); - - String data = "{\"example\":\"this is an example\"}"; - - ProjectSync ps = projectSyncsRepository.getProjectSync(data, p, "user1"); - - ps = this.projectSyncsRepository.save(ps); - ps = this.projectSyncsRepository.findOne(ps.getId()); - - p = projectRepository.findOne(this.testProjects.get(0).getId()); - - Assert.assertNotNull(ps.getProject()); - Assert.assertEquals(p.getId(), ps.getProject().getId()); - Assert.assertEquals("Revision of the project sync mustbe one less tha the rev counter pf the project", p.getRevCounter()-1, ps.getRevision()); - - Assert.assertEquals("Revision of the project sync mustbe one less tha the rev counter of its project", ps.getProject().getRevCounter()-1, ps.getRevision()); - - } - - @Test(expected=RenkanException.class) - public void testGetProjectSyncExceptionNullProject() throws RenkanException { - - String data = "{\"example\":\"this is an example\"}"; - Project p = null; - ProjectSync ps = projectSyncsRepository.getProjectSync(data, p, "user1"); - - // should never be executed. - Assert.assertNull(ps); - } - - @Test(expected=RenkanException.class) - public void testGetProjectSyncExceptionNullId() throws RenkanException { - - String data = "{\"example\":\"this is an example\"}"; - String project_id = null; - ProjectSync ps = projectSyncsRepository.getProjectSync(data, project_id, "user1"); - - // should never be executed. - Assert.assertNull(ps); - } - - @Test(expected=RenkanException.class) - public void testGetProjectSyncExceptionEmptyId() throws RenkanException { - - String data = "{\"example\":\"this is an example\"}"; - String project_id = ""; - ProjectSync ps = projectSyncsRepository.getProjectSync(data, project_id, "user1"); - - // should never be executed. - Assert.assertNull(ps); - } - - @Test(expected=RenkanException.class) - public void testGetProjectSyncExceptionBadId() throws RenkanException { - - String data = "{\"example\":\"this is an example\"}"; - String project_id = "BAD_ID"; - ProjectSync ps = projectSyncsRepository.getProjectSync(data, project_id, "user1"); - - // should never be executed. - Assert.assertNull(ps); - } - + @Test + public void testGetProjectSyncRevision() throws RenkanException { + + Project p = projectRepository.findOne(this.testProjects.get(0).getId()); + + String data = "{\"example\":\"this is an example\"}"; + + ProjectSync ps = projectSyncsRepository + .getProjectSync(data, p, "user1"); + + ps = this.projectSyncsRepository.save(ps); + ps = this.projectSyncsRepository.findOne(ps.getId()); + + p = projectRepository.findOne(this.testProjects.get(0).getId()); + + Assert.assertNotNull(ps.getProject()); + Assert.assertEquals(p.getId(), ps.getProject().getId()); + Assert.assertEquals( + "Revision of the project sync mustbe one less tha the rev counter pf the project", + p.getRevCounter() - 1, ps.getRevision()); + + Assert.assertEquals( + "Revision of the project sync mustbe one less tha the rev counter of its project", + ps.getProject().getRevCounter() - 1, ps.getRevision()); + + } + + @Test(expected = RenkanException.class) + public void testGetProjectSyncExceptionNullProject() throws RenkanException { + + String data = "{\"example\":\"this is an example\"}"; + Project p = null; + ProjectSync ps = projectSyncsRepository + .getProjectSync(data, p, "user1"); + + // should never be executed. + Assert.assertNull(ps); + } + + @Test(expected = RenkanException.class) + public void testGetProjectSyncExceptionNullId() throws RenkanException { + + String data = "{\"example\":\"this is an example\"}"; + String project_id = null; + ProjectSync ps = projectSyncsRepository.getProjectSync(data, + project_id, "user1"); + + // should never be executed. + Assert.assertNull(ps); + } + + @Test(expected = RenkanException.class) + public void testGetProjectSyncExceptionEmptyId() throws RenkanException { + + String data = "{\"example\":\"this is an example\"}"; + String project_id = ""; + ProjectSync ps = projectSyncsRepository.getProjectSync(data, + project_id, "user1"); + + // should never be executed. + Assert.assertNull(ps); + } + + @Test(expected = RenkanException.class) + public void testGetProjectSyncExceptionBadId() throws RenkanException { + + String data = "{\"example\":\"this is an example\"}"; + String project_id = "BAD_ID"; + ProjectSync ps = projectSyncsRepository.getProjectSync(data, + project_id, "user1"); + + // should never be executed. + Assert.assertNull(ps); + } + } diff -r 2e738512336a -r 18a43ba77ad0 server/src/test/java/org/iri_research/renkan/test/repositories/ProjectsRepositoryTest.java --- a/server/src/test/java/org/iri_research/renkan/test/repositories/ProjectsRepositoryTest.java Fri Oct 25 16:42:11 2013 +0200 +++ b/server/src/test/java/org/iri_research/renkan/test/repositories/ProjectsRepositoryTest.java Wed Jan 15 18:36:27 2014 +0100 @@ -1,11 +1,10 @@ package org.iri_research.renkan.test.repositories; - import java.util.ArrayList; import java.util.Arrays; -import java.util.Date; import java.util.List; import java.util.Map; +import java.util.TimeZone; import java.util.UUID; import org.iri_research.renkan.models.Edge; @@ -13,11 +12,15 @@ import org.iri_research.renkan.models.Project; import org.iri_research.renkan.models.ProjectRevision; import org.iri_research.renkan.models.Space; +import org.iri_research.renkan.models.User; import org.iri_research.renkan.repositories.EdgesRepository; import org.iri_research.renkan.repositories.NodesRepository; import org.iri_research.renkan.repositories.ProjectRevisionsRepository; import org.iri_research.renkan.repositories.ProjectsRepository; import org.iri_research.renkan.repositories.SpacesRepository; +import org.iri_research.renkan.repositories.UsersRepository; +import org.iri_research.renkan.utils.ColorGenerator; +import org.joda.time.DateTime; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -39,452 +42,655 @@ import com.mongodb.DBObject; import com.mongodb.DBRef; - @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("repositories-context.xml") public class ProjectsRepositoryTest { - private final static int SPACE_NB = 3; - - private Logger logger = LoggerFactory.getLogger(ProjectsRepositoryTest.class); - - @Autowired - private ProjectsRepository projectsRepository; - - @Autowired - private SpacesRepository spacesRepository; - - @Autowired - private NodesRepository nodesRepository; - - @Autowired - private EdgesRepository edgesRepository; - - @Autowired - private ProjectRevisionsRepository projectRevisionsRepository; - - @Autowired - private MongoTemplate mongoTemplate; - - private ArrayList testProjects = new ArrayList(); - private List testNodes = new ArrayList(); - private List testEdges = new ArrayList<>(); - - private Date creationDate = new Date(); - - private List spaceIds = new ArrayList<>(); - - private Project copyProject; - - public ProjectsRepositoryTest() { - } - - @Before - public void setup() { + private final static int SPACE_NB = 3; + + private Logger logger = LoggerFactory + .getLogger(ProjectsRepositoryTest.class); + + @Autowired + private ProjectsRepository projectsRepository; + + @Autowired + private SpacesRepository spacesRepository; + + @Autowired + private NodesRepository nodesRepository; + + @Autowired + private EdgesRepository edgesRepository; + + @Autowired + private UsersRepository usersRepository; + + @Autowired + private ProjectRevisionsRepository projectRevisionsRepository; + + @Autowired + private MongoTemplate mongoTemplate; + + private ArrayList testProjects = new ArrayList(); + private List testNodes = new ArrayList<>(); + private List testEdges = new ArrayList<>(); + private List testUsers = new ArrayList<>(); + + private DateTime creationDate = new DateTime(); + + private List spaceIds = new ArrayList<>(); + + private Project copyProject; + + public ProjectsRepositoryTest() { + } + + @Before + public void setup() { + + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + logger.debug("Setup"); + + // CREATE USERS + 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); + + ArrayList pl = new ArrayList(); + Space testSpace = null; + for (int i = 0; i < SPACE_NB; i++) { + spaceIds.add(UUID.randomUUID().toString()); + testSpace = new Space(this.spaceIds.get(i), "test space " + i, + "Test space " + i, null, null, null, "test_user", null, + this.creationDate); + testSpace = spacesRepository.save(testSpace); + 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 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); + } else { + p.addUser(null, null); + } + + } + } + + for (Project p : projectsRepository.save(pl)) { + this.testProjects.add(p); + } + + copyProject = this.testProjects.get(0); + + for (int i = 0; i < 3; i++) { + Node node = new Node("Node" + i, "Node" + i, "Node " + i, + "http://renkan.org/nodes/node" + i, "#ffff0" + i, + "test_user", new Point(0, i), + "http://renkan.org/images/node" + i, i, copyProject.getId()); + node = this.nodesRepository.save(node); + copyProject.getNodes().add(node); + this.testNodes.add(node); + } + for (int i = 0; i < 3; i++) { + Edge edge = new Edge("Node" + i, "Node" + i, "Node " + i, + "http://renkan.org/edges/edge" + i, "#ffff0" + i, + this.testNodes.get((i + 2) % 3), this.testNodes.get(i), + "test_user", copyProject.getId()); + edge = this.edgesRepository.save(edge); + copyProject.getEdges().add(edge); + this.testEdges.add(edge); + } + + this.projectsRepository.save(copyProject); + + } + + @After + public void teardown() { + logger.debug("Teardown"); + edgesRepository.deleteAll(); + nodesRepository.deleteAll(); + projectRevisionsRepository.deleteAll(); + projectsRepository.deleteAll(); + spacesRepository.deleteAll(); + usersRepository.deleteAll(); + } + + @Test + public void testInitialRevCounter() { + + Project p = projectsRepository + .findOne(this.testProjects.get(0).getId()); + + Assert.assertEquals("Initial rev counter should be 1", 1, + p.getRevCounter()); + } + + @Test + public void testIncrementRevCounter() { + + int revCounter = projectsRepository.getRevCounter(this.testProjects + .get(0).getId()); + Assert.assertEquals("After 1 call rev counter should be 1", 1, + revCounter); + revCounter = projectsRepository.getRevCounter(this.testProjects.get(0) + .getId()); + Assert.assertEquals("After 2 calls rev counter should be 2", 2, + revCounter); + + for (int i = 0; i < 10; i++) { + revCounter = projectsRepository.getRevCounter(this.testProjects + .get(0).getId()); + } + + Assert.assertEquals("After 10 more calls rev counter should be 12", 12, + revCounter); + + Project p = projectsRepository + .findOne(this.testProjects.get(0).getId()); - logger.debug("Setup"); - ArrayList pl = new ArrayList(); - Space testSpace = null; - for(int i=0; i groupRes = projectsRepository.getCountBySpace(); + + Assert.assertNotNull("GroupRes not null", groupRes); + Assert.assertEquals("Group res size", SPACE_NB - 1, groupRes.size()); + + for (int i = 0; i < (SPACE_NB - 1); i++) { + Integer count = groupRes.get(this.spaceIds.get(i)); + Assert.assertNotNull("count not null", count); + Assert.assertEquals("Nb of project/space", 2 - i, count.intValue()); + } + + Assert.assertNull("Last space id has no project i.e count is null", + groupRes.get(this.spaceIds.get(SPACE_NB - 1))); + } + + @Test + public void testGetCountBySpaceFilter() { + + List spacesIdsFilter = Arrays.asList(this.spaceIds.get(0)); + + Map groupRes = projectsRepository + .getCountBySpace(spacesIdsFilter); + + Assert.assertNotNull("GroupRes not null", groupRes); + Assert.assertEquals("Group res size", 1, groupRes.size()); + + Integer count = groupRes.get(this.spaceIds.get(0)); + Assert.assertNotNull("count not null", count); + Assert.assertEquals("Nb of project/space", 2, count.intValue()); - } - - @After - public void teardown() { - logger.debug("Teardown"); - edgesRepository.deleteAll(); - nodesRepository.deleteAll(); - projectRevisionsRepository.deleteAll(); - projectsRepository.deleteAll(); - spacesRepository.deleteAll(); - } - - @Test - public void testInitialRevCounter() { - - Project p = projectsRepository.findOne(this.testProjects.get(0).getId()); - - Assert.assertEquals("Initial rev counter should be 1", 1, p.getRevCounter()); - } - - @Test - public void testIncrementRevCounter() { - - int revCounter = projectsRepository.getRevCounter(this.testProjects.get(0).getId()); - Assert.assertEquals("After 1 call rev counter should be 1", 1, revCounter); - revCounter = projectsRepository.getRevCounter(this.testProjects.get(0).getId()); - Assert.assertEquals("After 2 calls rev counter should be 2", 2, revCounter); + for (int i = 1; i < SPACE_NB; i++) { + Assert.assertNull( + "other space id has no project i.e count is null", + groupRes.get(this.spaceIds.get(i))); + } + } + + @Test + public void testGetCountByUser() { + + Map groupRes = projectsRepository.getCountByUser(); + int nu = this.testUsers.size(); + + Assert.assertNotNull("GroupRes not null", groupRes); + Assert.assertEquals("Group res size", nu, groupRes.size()); + + 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).getId())); + + 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 + public void testGetCountByUserFilter() { + + List userIdsFilter = Arrays.asList(this.testUsers.get(0) + .getId()); + + Map groupRes = projectsRepository + .getCountByUser(userIdsFilter); + + Assert.assertNotNull("GroupRes not null", groupRes); + Assert.assertEquals("Group res size", 1, groupRes.size()); - for(int i=0; i<10; i++) { - revCounter = projectsRepository.getRevCounter(this.testProjects.get(0).getId()); - } - - Assert.assertEquals("After 10 more calls rev counter should be 12", 12, revCounter); - - Project p = projectsRepository.findOne(this.testProjects.get(0).getId()); - - Assert.assertEquals("next rev counter should be 13", 13, p.getRevCounter()); - - p = projectsRepository.findOne(this.testProjects.get(1).getId()); - - Assert.assertEquals("other project next rev counter should be 1", 1, p.getRevCounter()); - - } - - - @Test - public void testIncrementNonExisting() { - - int revCounter = projectsRepository.getRevCounter("aaaa"); - Assert.assertEquals("Rev counter non existing == -1", -1, revCounter); - - } - - @Test - public void testIncrementNull() { - - int revCounter = projectsRepository.getRevCounter(null); - Assert.assertEquals("Rev counter null == -1", -1, revCounter); - - } + Integer count = groupRes.get(this.testUsers.get(0).getId()); + Assert.assertNotNull("count not null", count); + Assert.assertEquals("Nb of user/project", testProjects.size(), + count.intValue()); + + } + + @Test + public void testGetCountByUsername() { + + Map groupRes = projectsRepository.getCountByUsername(); + int nu = this.testUsers.size() - 1; + int nb_username = this.testUsers.size() + (SPACE_NB - 1) * SPACE_NB / 2 + - 2; + + Assert.assertNotNull("GroupRes not null", groupRes); + Assert.assertEquals("Group res size", nb_username, groupRes.size()); + + for (int i = 0; i < nu - 1; i++) { + Integer count = groupRes.get(this.testUsers.get(i).getUsername()); + 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).getUsername())); + + for (int i = 1; i < nu; i++) { + String anonymous_username = String.format("Anonymous-%d", i); + Integer count = groupRes.get(anonymous_username); + Assert.assertEquals("Nb of anonymous user/project", nu - i, + count.intValue()); + } + + } + + @Test + public void testGetCountByUsernameFilter() { + + List usernamesFilter = Arrays.asList(this.testUsers.get(0) + .getUsername()); + + Map groupRes = projectsRepository + .getCountByUsername(usernamesFilter); - @Test - public void testIncrementEmpty() { - - int revCounter = projectsRepository.getRevCounter(""); - Assert.assertEquals("Rev counter empty == -1", -1, revCounter); - - } - - @Test - public void testDateCreation() { - - for (Project p : projectsRepository.findAll()) { - Assert.assertEquals(this.creationDate, p.getCreated()); - } - } - - @Test - public void testGetCountBySpace() { - - Map groupRes = projectsRepository.getCountBySpace(); - - Assert.assertNotNull("GroupRes not null", groupRes); - Assert.assertEquals("Group res size", SPACE_NB-1, groupRes.size()); - - for(int i=0;i<(SPACE_NB-1);i++) { - Integer count = groupRes.get(this.spaceIds.get(i)); - Assert.assertNotNull("count not null", count); - Assert.assertEquals("Nb of project/space", 2-i, count.intValue()); - } - - Assert.assertNull("Last space id has no project i.e count is null", groupRes.get(this.spaceIds.get(SPACE_NB-1))); - } - - @Test - public void testGetCountBySpaceFilter() { - - List spacesIdsFilter = Arrays.asList(this.spaceIds.get(0)); - - Map groupRes = projectsRepository.getCountBySpace(spacesIdsFilter); - - Assert.assertNotNull("GroupRes not null", groupRes); - Assert.assertEquals("Group res size", 1, groupRes.size()); - - Integer count = groupRes.get(this.spaceIds.get(0)); - Assert.assertNotNull("count not null", count); - Assert.assertEquals("Nb of project/space", 2, count.intValue()); - - for(int i=1; i nodes = copyProject.getNodes(); + List edges = copyProject.getEdges(); + + this.projectsRepository.deleteRecursive(copyProject); - Assert.assertEquals("same color", originalEdge.getColor(), obj.get("color")); - Assert.assertEquals("same desc", originalEdge.getDescription(), obj.get("description")); - Assert.assertEquals("same uri", originalEdge.getUri(), obj.get("uri")); - - - // get FromNode - DBObject fromNode = nodesColl.findOne(((DBRef)obj.get("from")).getId()); - Assert.assertNotNull("fromNode must exits ", fromNode); - Assert.assertFalse("must be different from node", originalEdge.getFrom().equals(fromNode.get("_id"))); - Assert.assertEquals("same from title", originalEdge.getFromNode().getTitle(), fromNode.get("title")); - - DBObject toNode = nodesColl.findOne(((DBRef)obj.get("to")).getId()); - Assert.assertNotNull("toNode must exits", toNode); - Assert.assertFalse("must be different to node", originalEdge.getTo().equals(toNode.get("_id"))); - Assert.assertEquals("same to title", originalEdge.getToNode().getTitle(), toNode.get("title")); - - } - } - - @Test - public void testDeleteRecursive() { - - List nodes= copyProject.getNodes(); - List edges= copyProject.getEdges(); - - this.projectsRepository.deleteRecursive(copyProject); - - DBObject filter = new BasicDBObject(); - filter.put("_id", copyProject.getId()); - - DBCollection coll = mongoTemplate.getCollection(mongoTemplate.getCollectionName(Project.class)); - DBCursor resFind = coll.find(filter); - - Assert.assertEquals("The project must not be found", 0, resFind.count()); - - filter = new BasicDBObject(); - filter.put("project_id", copyProject.getId()); - - DBCollection nodesColl = mongoTemplate.getCollection(mongoTemplate.getCollectionName(Node.class)); - resFind = nodesColl.find(filter); - - Assert.assertEquals("no nodes left", 0, resFind.count()); - - for(Node n: nodes) { - DBObject nobj = nodesColl.findOne(n.getId()); - Assert.assertNull("node should be deleted", nobj); - } + DBObject filter = new BasicDBObject(); + filter.put("_id", copyProject.getId()); + + DBCollection coll = mongoTemplate.getCollection(mongoTemplate + .getCollectionName(Project.class)); + DBCursor resFind = coll.find(filter); + + Assert.assertEquals("The project must not be found", 0, resFind.count()); + + filter = new BasicDBObject(); + filter.put("project_id", copyProject.getId()); + + DBCollection nodesColl = mongoTemplate.getCollection(mongoTemplate + .getCollectionName(Node.class)); + resFind = nodesColl.find(filter); + + Assert.assertEquals("no nodes left", 0, resFind.count()); + + for (Node n : nodes) { + DBObject nobj = nodesColl.findOne(n.getId()); + Assert.assertNull("node should be deleted", nobj); + } + + DBCollection edgesColl = mongoTemplate.getCollection(mongoTemplate + .getCollectionName(Edge.class)); + resFind = edgesColl.find(filter); + + Assert.assertEquals("no edges left", 0, resFind.count()); + + for (Edge e : edges) { + DBObject eobj = edgesColl.findOne(e.getId()); + Assert.assertNull("edge should be deleted", eobj); + } + + } - - DBCollection edgesColl = mongoTemplate.getCollection(mongoTemplate.getCollectionName(Edge.class)); - resFind = edgesColl.find(filter); - - Assert.assertEquals("no edges left", 0, resFind.count()); - - for(Edge e: edges) { - DBObject eobj = edgesColl.findOne(e.getId()); - Assert.assertNull("edge should be deleted", eobj); - } - - } - - @SuppressWarnings("unchecked") - @Test - public void testDeleteRecursiveProjectRevision() { - - List nodes= copyProject.getNodes(); - List edges= copyProject.getEdges(); - - int revCounter = copyProject.getRevCounter(); - - this.projectsRepository.deleteRecursive(copyProject); + @SuppressWarnings("unchecked") + @Test + public void testDeleteRecursiveProjectRevision() { + + List nodes = copyProject.getNodes(); + List edges = copyProject.getEdges(); + + int revCounter = copyProject.getRevCounter(); + + this.projectsRepository.deleteRecursive(copyProject); + + DBCollection coll = mongoTemplate.getCollection(mongoTemplate + .getCollectionName(ProjectRevision.class)); + + DBObject filter = new BasicDBObject(); + filter.put("project", new DBRef(mongoTemplate.getDb(), "projects", + copyProject.getId())); + filter.put("revision", new Integer(revCounter)); + + DBObject revision = coll.findOne(filter); + + Assert.assertNotNull("Must find revision", revision); + + for (DBObject nobj : ((Iterable) revision.get("nodes"))) { + Node node = null; + for (Node n : nodes) { + if (n.getId().equals(nobj.get("_id"))) { + node = n; + break; + } + } + Assert.assertNotNull("Node must be in the original list", node); + Assert.assertEquals("Nodes must have same title", node.getTitle(), + nobj.get("title")); + } - DBCollection coll = mongoTemplate.getCollection(mongoTemplate.getCollectionName(ProjectRevision.class)); - - DBObject filter = new BasicDBObject(); - filter.put("project", new DBRef(mongoTemplate.getDb(), "projects", copyProject.getId())); - filter.put("revision", new Integer(revCounter)); - - DBObject revision = coll.findOne(filter); - - Assert.assertNotNull("Must find revision", revision); - - for(DBObject nobj: ((Iterable)revision.get("nodes"))) { - Node node = null; - for(Node n: nodes) { - if(n.getId().equals(nobj.get("_id"))) { - node = n; - break; - } - } - Assert.assertNotNull("Node must be in the original list", node); - Assert.assertEquals("Nodes must have same title", node.getTitle(), nobj.get("title")); - } - - for(DBObject eobj: ((Iterable)revision.get("edges"))) { - Edge edge = null; - for(Edge e: edges) { - if(e.getId().equals(eobj.get("_id"))) { - edge = e; - break; - } - } - Assert.assertNotNull("Edge must be in the original list", edge); - Assert.assertEquals("Edges must have same title", edge.getTitle(), eobj.get("title")); - } - - } - - @Test - public void testFindBySpaceIdAndTitleRegex() { - - List res = this.projectsRepository.findBySpaceIdAndTitleRegex(this.spaceIds.get(0), ".*Project.*"); - - Assert.assertEquals("res must have length " + (SPACE_NB -1) , SPACE_NB-1, res.size()); - for(Project p: res) { - Assert.assertEquals("project must belong to the same space", this.spaceIds.get(0), p.getSpaceId()); - Assert.assertNotNull("project title must not be null", p.getTitle()); - Assert.assertTrue("project tilte must contains title", p.getTitle().matches(".*project.*")); - } - } - - @Test - public void testFindBySpaceIdAndTitleRegexBad() { - - List res = this.projectsRepository.findBySpaceIdAndTitleRegex(this.spaceIds.get(0), ".*foo.*"); - - Assert.assertEquals("res must have zero length", 0, res.size()); - } - - @Test - public void testFindBySpaceIdAndTitleRegexPageable() { - - PageRequest pr = new PageRequest(0, 1); - - Page res = this.projectsRepository.findBySpaceIdAndTitleRegex(this.spaceIds.get(0), ".*Project.*", pr); - - Assert.assertEquals("res must have length 1", 1, res.getNumberOfElements()); - for(Project p: res) { - Assert.assertEquals("project must belong to the same space", this.spaceIds.get(0), p.getSpaceId()); - Assert.assertNotNull("project title must not be null", p.getTitle()); - Assert.assertTrue("project tilte must contains title", p.getTitle().matches(".*project.*")); - } - } - - @Test - public void testFindBySpaceIdAndTitleRegexPageableBadSize() { - - PageRequest pr = new PageRequest(0, 3); - - Page res = this.projectsRepository.findBySpaceIdAndTitleRegex(this.spaceIds.get(0), ".*Project.*", pr); - - Assert.assertEquals("res must have length 2", 2, res.getNumberOfElements()); - for(Project p: res) { - Assert.assertEquals("project must belong to the same space", this.spaceIds.get(0), p.getSpaceId()); - Assert.assertNotNull("project title must not be null", p.getTitle()); - Assert.assertTrue("project tilte must contains title", p.getTitle().matches(".*project.*")); - } - } - - @Test - public void testFindBySpaceIdAndTitleRegexPageableBadPage() { - - PageRequest pr = new PageRequest(1, 3); - - Page res = this.projectsRepository.findBySpaceIdAndTitleRegex(this.spaceIds.get(0), ".*Project.*", pr); - - Assert.assertEquals("res must have length 0", 0, res.getNumberOfElements()); - } + for (DBObject eobj : ((Iterable) revision.get("edges"))) { + Edge edge = null; + for (Edge e : edges) { + if (e.getId().equals(eobj.get("_id"))) { + edge = e; + break; + } + } + Assert.assertNotNull("Edge must be in the original list", edge); + Assert.assertEquals("Edges must have same title", edge.getTitle(), + eobj.get("title")); + } + + } + + @Test + public void testFindBySpaceIdAndTitleRegex() { + + List res = this.projectsRepository.findBySpaceIdAndTitleRegex( + this.spaceIds.get(0), ".*Project.*"); + + Assert.assertEquals("res must have length " + (SPACE_NB - 1), + SPACE_NB - 1, res.size()); + for (Project p : res) { + Assert.assertEquals("project must belong to the same space", + this.spaceIds.get(0), p.getSpaceId()); + Assert.assertNotNull("project title must not be null", p.getTitle()); + Assert.assertTrue("project tilte must contains title", p.getTitle() + .matches(".*project.*")); + } + } + + @Test + public void testFindBySpaceIdAndTitleRegexBad() { + + List res = this.projectsRepository.findBySpaceIdAndTitleRegex( + this.spaceIds.get(0), ".*foo.*"); + + Assert.assertEquals("res must have zero length", 0, res.size()); + } + + @Test + public void testFindBySpaceIdAndTitleRegexPageable() { + + PageRequest pr = new PageRequest(0, 1); + + Page res = this.projectsRepository.findBySpaceIdAndTitleRegex( + this.spaceIds.get(0), ".*Project.*", pr); + + Assert.assertEquals("res must have length 1", 1, + res.getNumberOfElements()); + for (Project p : res) { + Assert.assertEquals("project must belong to the same space", + this.spaceIds.get(0), p.getSpaceId()); + Assert.assertNotNull("project title must not be null", p.getTitle()); + Assert.assertTrue("project tilte must contains title", p.getTitle() + .matches(".*project.*")); + } + } + + @Test + public void testFindBySpaceIdAndTitleRegexPageableBadSize() { + + PageRequest pr = new PageRequest(0, 3); + + Page res = this.projectsRepository.findBySpaceIdAndTitleRegex( + this.spaceIds.get(0), ".*Project.*", pr); + + Assert.assertEquals("res must have length 2", 2, + res.getNumberOfElements()); + for (Project p : res) { + Assert.assertEquals("project must belong to the same space", + this.spaceIds.get(0), p.getSpaceId()); + Assert.assertNotNull("project title must not be null", p.getTitle()); + Assert.assertTrue("project tilte must contains title", p.getTitle() + .matches(".*project.*")); + } + } + + @Test + public void testFindBySpaceIdAndTitleRegexPageableBadPage() { + + PageRequest pr = new PageRequest(1, 3); + + Page res = this.projectsRepository.findBySpaceIdAndTitleRegex( + this.spaceIds.get(0), ".*Project.*", pr); + + Assert.assertEquals("res must have length 0", 0, + res.getNumberOfElements()); + } } diff -r 2e738512336a -r 18a43ba77ad0 server/src/test/java/org/iri_research/renkan/test/repositories/SpacesRepositoryTest.java --- a/server/src/test/java/org/iri_research/renkan/test/repositories/SpacesRepositoryTest.java Fri Oct 25 16:42:11 2013 +0200 +++ b/server/src/test/java/org/iri_research/renkan/test/repositories/SpacesRepositoryTest.java Wed Jan 15 18:36:27 2014 +0100 @@ -1,14 +1,15 @@ package org.iri_research.renkan.test.repositories; import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.TimeZone; import java.util.UUID; import org.iri_research.renkan.models.Space; import org.iri_research.renkan.repositories.SpacesRepository; +import org.joda.time.DateTime; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -32,103 +33,131 @@ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("repositories-context.xml") public class SpacesRepositoryTest { - - private final static int SPACE_NB = 3; - - private Logger logger = LoggerFactory.getLogger(SpacesRepositoryTest.class); - - @Autowired - private SpacesRepository spacesRepository; + + private final static int SPACE_NB = 3; + + private Logger logger = LoggerFactory.getLogger(SpacesRepositoryTest.class); + + @Autowired + private SpacesRepository spacesRepository; + + @Autowired + private MongoTemplate mongoTemplate; + + private Map spacesList = new HashMap(SPACE_NB); + private List spacesUuids = new ArrayList<>(SPACE_NB); + + @Before + public void setup() { - @Autowired - private MongoTemplate mongoTemplate; - - private Map spacesList = new HashMap(SPACE_NB); - private List spacesUuids = new ArrayList<>(SPACE_NB); - - @Before - public void setup() { - - logger.debug("Setup"); - spacesRepository.deleteAll(); - for(int i=0;i page = this.spacesRepository.findAll(p); - - Assert.assertEquals("page content length must be two", 2, page.getNumberOfElements()); - Assert.assertEquals("id must be id of last created space", this.spacesUuids.get(SPACE_NB-1), page.getContent().get(0).getId()); - Assert.assertEquals("id must be id of last created space", this.spacesUuids.get(SPACE_NB-2), page.getContent().get(1).getId()); - - p = new PageRequest(1, 2, s); - page = this.spacesRepository.findAll(p); - Assert.assertEquals("page content length must be one", 1, page.getNumberOfElements()); - Assert.assertEquals("id must be id of first created space", this.spacesUuids.get(0), page.getContent().get(0).getId()); - - } - - @After - public void teardown() { - spacesRepository.deleteAll(); - } + @Test + public void testPagination() { + + Sort s = new Sort(Direction.DESC, "created"); + Pageable p = new PageRequest(0, 2, s); + + Page page = this.spacesRepository.findAll(p); - + Assert.assertEquals("page content length must be two", 2, + page.getNumberOfElements()); + Assert.assertEquals("id must be id of last created space", + this.spacesUuids.get(SPACE_NB - 1), page.getContent().get(0) + .getId()); + Assert.assertEquals("id must be id of last created space", + this.spacesUuids.get(SPACE_NB - 2), page.getContent().get(1) + .getId()); + + p = new PageRequest(1, 2, s); + page = this.spacesRepository.findAll(p); + Assert.assertEquals("page content length must be one", 1, + page.getNumberOfElements()); + Assert.assertEquals("id must be id of first created space", + this.spacesUuids.get(0), page.getContent().get(0).getId()); + + } + + @After + public void teardown() { + spacesRepository.deleteAll(); + } + } diff -r 2e738512336a -r 18a43ba77ad0 server/src/test/java/org/iri_research/renkan/test/repositories/UsersRepositoryTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/server/src/test/java/org/iri_research/renkan/test/repositories/UsersRepositoryTest.java Wed Jan 15 18:36:27 2014 +0100 @@ -0,0 +1,402 @@ +package org.iri_research.renkan.test.repositories; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TimeZone; +import java.util.UUID; +import java.util.Map.Entry; + +import org.iri_research.renkan.models.Group; +import org.iri_research.renkan.models.User; +import org.iri_research.renkan.repositories.GroupsRepository; +import org.iri_research.renkan.repositories.UsersRepository; +import org.joda.time.LocalDate; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import com.mongodb.DBCollection; +import com.mongodb.DBObject; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration("repositories-context.xml") +public class UsersRepositoryTest { + + private final static int USER_NB = 3; + private final static int GROUP_NB = 3; + + private Logger logger = LoggerFactory.getLogger(UsersRepositoryTest.class); + + @Autowired + private UsersRepository usersRepository; + @Autowired + private GroupsRepository groupsRepository; + + + @Autowired + private MongoTemplate mongoTemplate; + + private Map usersList = new HashMap(USER_NB); + private List usersUuids = new ArrayList<>(USER_NB); + + private Map groupsList = new HashMap(GROUP_NB); + private List groupsUuids = new ArrayList<>(GROUP_NB); + + + @Before + public void setup() { + + logger.debug("Setup"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + usersRepository.deleteAll(); + for(int i=0; i < USER_NB; i++) { + String uuid = UUID.randomUUID().toString(); + User user = new User(uuid, "user" + i, "User nb " + i, "http://www.iri.centrepompidou.fr", "#ababab"); + user.setLocked(false); + user.setEnabled(true); + user.setAvatar("A pretty picture"); + user.setExpirationDate(new LocalDate()); + user.setCredentialsExpirationDate(new LocalDate()); + user.setEmail(String.format("user%d@mail.com", i)); + user = usersRepository.save(user); + this.usersUuids.add(uuid); + this.usersList.put(uuid, user); + try { + Thread.sleep(1); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + for(int i=0; i < GROUP_NB; i++) { + String uuid = UUID.randomUUID().toString(); + Group group = new Group(uuid, "group" + i, "Group nb " + i, "http://www.iri.centrepompidou.fr/group/"+uuid, "#ababab"); + group.setAvatar("A pretty group picture " + i); + group = groupsRepository.save(group); + this.groupsUuids.add(uuid); + this.groupsList.put(uuid, group); + try { + Thread.sleep(1); + } catch (InterruptedException e) { + e.printStackTrace(); + } + + } + + + } + + @Test + public void testUserFieldMapping() { + // query json directly with mongodb driver + // check field values + DBCollection coll = mongoTemplate.getCollection(mongoTemplate + .getCollectionName(User.class)); + + for (DBObject obj : coll.find()) { + Assert.assertTrue("mongo object must have _id field", + obj.containsField("_id")); + + String id = obj.get("_id").toString(); + + User user = this.usersList.get(id); + + Assert.assertTrue("mongo object must have title field", + obj.containsField("title")); + Assert.assertEquals("Titles must be the same", + user.getTitle(), obj.get("title")); + + Assert.assertTrue("mongo object must have description field", + obj.containsField("description")); + Assert.assertEquals("description must be the same", + user.getDescription(), obj.get("description")); + + Assert.assertTrue("mongo object must have color field", + obj.containsField("color")); + Assert.assertEquals("Color must be the same", user.getColor(), obj.get("color")); + + Assert.assertTrue("mongo object must have uri field", + obj.containsField("uri")); + Assert.assertEquals("Uri must be the same", user.getUri(), obj.get("uri")); + + Assert.assertTrue("mongo object must have locked field", + obj.containsField("locked")); + Assert.assertEquals("Locked must be the same", user.isLocked(), obj.get("locked")); + + Assert.assertTrue("mongo object must have activated field", + obj.containsField("enabled")); + Assert.assertEquals("Enabled must be the same", user.isEnabled(), obj.get("enabled")); + + Assert.assertTrue("mongo object must have expiration_date field", + obj.containsField("expiration_date")); + Assert.assertEquals("expiration_date must be the same", user.getExpirationDate(), new LocalDate(obj.get("expiration_date"))); + + Assert.assertTrue("mongo object must have credentials_expiration_date field", + obj.containsField("credentials_expiration_date")); + Assert.assertEquals("credentials_expiration_date by must be the same", user.getCredentialsExpirationDate(), new LocalDate(obj.get("credentials_expiration_date"))); + + Assert.assertTrue("mongo object must have email field", + obj.containsField("email")); + Assert.assertEquals("Email must be the same", user.getEmail(), obj.get("email")); + + + } + } + + @Test + public void testSetGroupsList() { + + User user = this.usersList.get(this.usersUuids.get(0)); + + List groupIds = this.groupsUuids; + + this.usersRepository.setGroupsList(user, groupIds); + + //reload user + user = this.usersRepository.findOne(user.getId()); + + Assert.assertEquals("user group is big enough", groupIds.size(), user.getGroups().size()); + Assert.assertTrue("Group list contains all group", user.getGroups().containsAll(groupIds)); + + for (Group g : this.groupsRepository.findAll(groupIds)) { + Assert.assertEquals(String.format("user list for group %s must be size 1", g.getId()), 1, g.getUsers().size()); + Assert.assertTrue(String.format("user list for group %s must contains user %s", g.getId(), user.getId()), g.getUsers().contains(user.getId())); + } + } + + + @Test + public void testAddGroupsList() { + User user = this.usersList.get(this.usersUuids.get(1)); + + List groupIds = this.groupsUuids.subList(0, 1); + this.usersRepository.setGroupsList(user, groupIds); + + user = this.usersRepository.findOne(user.getId()); + + Assert.assertEquals("user group is big enough", groupIds.size(), user.getGroups().size()); + Assert.assertTrue("Group list contains all group", user.getGroups().containsAll(groupIds)); + + Group group = this.groupsRepository.findOne(groupIds.get(0)); + Assert.assertEquals(String.format("user list for group %s must be size 1", group.getId()), 1, group.getUsers().size()); + Assert.assertTrue(String.format("user list for group %s must contains user %s", group.getId(), user.getId()), group.getUsers().contains(user.getId())); + + this.usersRepository.setGroupsList(user, this.groupsUuids); + + //reload user + user = this.usersRepository.findOne(user.getId()); + + Assert.assertEquals("user group is big enough", this.groupsUuids.size(), user.getGroups().size()); + Assert.assertTrue("Group list contains all group", user.getGroups().containsAll(this.groupsUuids)); + + for (Group g : this.groupsRepository.findAll(this.groupsUuids)) { + Assert.assertEquals(String.format("user list for group %s must be size 1", g.getId()), 1, g.getUsers().size()); + Assert.assertTrue(String.format("user list for group %s must contains user %s", g.getId(), user.getId()), g.getUsers().contains(user.getId())); + } + + } + + @Test + public void testRemoveGroupsList() { + User user = this.usersList.get(this.usersUuids.get(2)); + + this.usersRepository.setGroupsList(user, this.groupsUuids); + + user = this.usersRepository.findOne(user.getId()); + + Assert.assertEquals("user group is big enough", this.groupsUuids.size(), user.getGroups().size()); + Assert.assertTrue("Group list contains all group", user.getGroups().containsAll(this.groupsUuids)); + + for(Group group : this.groupsRepository.findAll(this.groupsUuids)) { + Assert.assertEquals(String.format("user list for group %s must be size 1", group.getId()), 1, group.getUsers().size()); + Assert.assertTrue(String.format("user list for group %s must contains user %s", group.getId(), user.getId()), group.getUsers().contains(user.getId())); + } + + this.usersRepository.setGroupsList(user, this.groupsUuids.subList(GROUP_NB-1, GROUP_NB)); + + //reload user + user = this.usersRepository.findOne(user.getId()); + + Assert.assertEquals("user group is big enough", 1, user.getGroups().size()); + Assert.assertTrue("Group list contains all group", user.getGroups().contains(this.groupsUuids.get(GROUP_NB-1))); + + Group g = this.groupsRepository.findOne(this.groupsUuids.get(GROUP_NB-1)); + Assert.assertEquals(String.format("user list for group %s must be size 1", g.getId()), 1, g.getUsers().size()); + Assert.assertTrue(String.format("user list for group %s must contains user %s", g.getId(), user.getId()), g.getUsers().contains(user.getId())); + + for(Group otherGroup: this.groupsRepository.findAll(this.groupsUuids.subList(0, GROUP_NB-2))) { + Assert.assertEquals(String.format("user list for group %s must be size 0", otherGroup.getId()), 0, otherGroup.getUsers().size()); + } + + } + + @Test + public void testAddGroupsListExisting() { + + // get first user + User user = this.usersList.get(this.usersUuids.get(0)); + + List groupIds = this.groupsUuids; + + // set all groups for first user + this.usersRepository.setGroupsList(user, groupIds); + + //reload user + user = this.usersRepository.findOne(user.getId()); + + //check that user has all group + Assert.assertEquals("user group is big enough", groupIds.size(), user.getGroups().size()); + Assert.assertTrue("Group list contains all group", user.getGroups().containsAll(groupIds)); + + // and that groups have all new user + for (Group g : this.groupsRepository.findAll(groupIds)) { + Assert.assertEquals(String.format("user list for group %s must be size 1", g.getId()), 1, g.getUsers().size()); + Assert.assertTrue(String.format("user list for group %s must contains user %s", g.getId(), user.getId()), g.getUsers().contains(user.getId())); + } + + + // get second user + user = this.usersList.get(this.usersUuids.get(1)); + + //first set one group + List secondGroupIds = this.groupsUuids.subList(0, 1); + this.usersRepository.setGroupsList(user, secondGroupIds); + + // relaod user + user = this.usersRepository.findOne(user.getId()); + + // check that second user has all groups + Assert.assertEquals("user group is big enough", secondGroupIds.size(), user.getGroups().size()); + Assert.assertTrue("Group list contains all group", user.getGroups().containsAll(secondGroupIds)); + + // check that group has new and old user + Group group = this.groupsRepository.findOne(secondGroupIds.get(0)); + Assert.assertEquals(String.format("user list for group %s must be size 2", group.getId()), 2, group.getUsers().size()); + Assert.assertTrue(String.format("user list for group %s must contains user %s", group.getId(), user.getId()), group.getUsers().contains(user.getId())); + Assert.assertTrue(String.format("user list for group %s must contains user %s", group.getId(), usersUuids.get(0)), group.getUsers().contains(usersUuids.get(0))); + + // set all new group list for second user + this.usersRepository.setGroupsList(user, this.groupsUuids); + + //reload user + user = this.usersRepository.findOne(user.getId()); + + //check that user 2 has all groups + Assert.assertEquals("user group is big enough", this.groupsUuids.size(), user.getGroups().size()); + Assert.assertTrue("Group list contains all group", user.getGroups().containsAll(this.groupsUuids)); + + // check that all groups had user 1 and user 2 + for (Group g : this.groupsRepository.findAll(this.groupsUuids)) { + Assert.assertEquals(String.format("user list for group %s must be size 1", g.getId()), 2, g.getUsers().size()); + Assert.assertTrue(String.format("user list for group %s must contains user %s", g.getId(), user.getId()), g.getUsers().contains(user.getId())); + Assert.assertTrue(String.format("user list for group %s must contains user %s", g.getId(), usersUuids.get(0)), g.getUsers().contains(usersUuids.get(0))); + } + + } + + @Test + public void testRemoveGroupsListExisting() { + + // get first user + User user = this.usersList.get(this.usersUuids.get(0)); + + List groupIds = this.groupsUuids; + + // set all groups for first user + this.usersRepository.setGroupsList(user, groupIds); + + //reload user + user = this.usersRepository.findOne(user.getId()); + + //check that user has all group + Assert.assertEquals("user group is big enough", groupIds.size(), user.getGroups().size()); + Assert.assertTrue("Group list contains all group", user.getGroups().containsAll(groupIds)); + + // and that groups have all new user + for (Group g : this.groupsRepository.findAll(groupIds)) { + Assert.assertEquals(String.format("user list for group %s must be size 1", g.getId()), 1, g.getUsers().size()); + Assert.assertTrue(String.format("user list for group %s must contains user %s", g.getId(), user.getId()), g.getUsers().contains(user.getId())); + } + + // get 3rd user + user = this.usersList.get(this.usersUuids.get(2)); + + // set all group for 3rd user + this.usersRepository.setGroupsList(user, this.groupsUuids); + + //reload 3rd user + user = this.usersRepository.findOne(user.getId()); + + //check taht all group are set for 3rd user + Assert.assertEquals("user group is big enough", this.groupsUuids.size(), user.getGroups().size()); + Assert.assertTrue("Group list contains all group", user.getGroups().containsAll(this.groupsUuids)); + + //check that all group has 3rd user and 1st user + for(Group group : this.groupsRepository.findAll(this.groupsUuids)) { + Assert.assertEquals(String.format("user list for group %s must be size 2", group.getId()), 2, group.getUsers().size()); + Assert.assertTrue(String.format("user list for group %s must contains user %s", group.getId(), user.getId()), group.getUsers().contains(user.getId())); + Assert.assertTrue(String.format("user list for group %s must contains user %s", group.getId(), this.usersUuids.get(0)), group.getUsers().contains(this.usersUuids.get(0))); + } + + //set new group list for 3rd user + this.usersRepository.setGroupsList(user, this.groupsUuids.subList(GROUP_NB-1, GROUP_NB)); + + //reload 3rd user + user = this.usersRepository.findOne(user.getId()); + + //check that 3rd user has only one group (last group) + Assert.assertEquals("user group is big enough", 1, user.getGroups().size()); + Assert.assertTrue("Group list contains all group", user.getGroups().contains(this.groupsUuids.get(GROUP_NB-1))); + + // check that last group has 3rd and 1rst user + Group g = this.groupsRepository.findOne(this.groupsUuids.get(GROUP_NB-1)); + Assert.assertEquals(String.format("user list for group %s must be size 1", g.getId()), 2, g.getUsers().size()); + Assert.assertTrue(String.format("user list for group %s must contains user %s", g.getId(), user.getId()), g.getUsers().contains(user.getId())); + Assert.assertTrue(String.format("user list for group %s must contains user %s", g.getId(), this.usersUuids.get(0)), g.getUsers().contains(this.usersUuids.get(0))); + + // check that other groups has only 1rst user + for(Group otherGroup: this.groupsRepository.findAll(this.groupsUuids.subList(0, GROUP_NB-2))) { + Assert.assertEquals(String.format("user list for group %s must be size 0", otherGroup.getId()), 1, otherGroup.getUsers().size()); + Assert.assertTrue(String.format("user list for group %s must contains user %s", otherGroup.getId(), this.usersUuids.get(0)), otherGroup.getUsers().contains(this.usersUuids.get(0))); + } + + } + + @Test + public void testGetUsersMap() { + + User user = this.usersList.get(this.usersUuids.get(0)); + + List groupdIds = this.groupsUuids; + + this.usersRepository.setGroupsList(user, groupdIds); + + + Map groupsMap = this.usersRepository.getGroupsMap(user); + + Assert.assertEquals ("Group map should have same length than groups list", this.groupsUuids.size(), groupsMap.size()); + Assert.assertTrue("Group map should contains all uuids", this.groupsUuids.containsAll(groupsMap.keySet())); + for (Entry entry : groupsMap.entrySet()) { + Assert.assertTrue("user id in user uuid", this.groupsUuids.contains(entry.getKey())); + Assert.assertEquals("key id and value user id must be the same", entry.getKey(), entry.getValue().getId()); + } + } + + + @After + public void teardown() { + this.usersRepository.deleteAll(); + this.groupsRepository.deleteAll(); + } + +} diff -r 2e738512336a -r 18a43ba77ad0 server/src/test/java/org/iri_research/renkan/test/rest/ProjectRestTest.java --- a/server/src/test/java/org/iri_research/renkan/test/rest/ProjectRestTest.java Fri Oct 25 16:42:11 2013 +0200 +++ b/server/src/test/java/org/iri_research/renkan/test/rest/ProjectRestTest.java Wed Jan 15 18:36:27 2014 +0100 @@ -1,10 +1,17 @@ package org.iri_research.renkan.test.rest; +import java.io.IOException; import java.util.ArrayList; -import java.util.Date; import java.util.List; +import java.util.TimeZone; import java.util.UUID; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.Application; +import javax.ws.rs.core.MediaType; + +import org.glassfish.jersey.server.ResourceConfig; +import org.glassfish.jersey.test.JerseyTest; import org.iri_research.renkan.models.Edge; import org.iri_research.renkan.models.Node; import org.iri_research.renkan.models.Project; @@ -14,6 +21,9 @@ import org.iri_research.renkan.repositories.ProjectRevisionsRepository; import org.iri_research.renkan.repositories.ProjectsRepository; import org.iri_research.renkan.repositories.SpacesRepository; +import org.iri_research.renkan.rest.RestApplication; +import org.joda.time.DateTime; +import org.joda.time.format.ISODateTimeFormat; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -26,146 +36,198 @@ import org.springframework.data.mongodb.core.geo.Point; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.web.context.ContextLoaderListener; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.joda.JodaModule; import com.mongodb.BasicDBObject; import com.mongodb.DBCollection; import com.mongodb.DBCursor; import com.mongodb.DBObject; -import com.sun.jersey.api.client.WebResource; -import com.sun.jersey.spi.spring.container.servlet.SpringServlet; -import com.sun.jersey.test.framework.AppDescriptor; -import com.sun.jersey.test.framework.JerseyTest; -import com.sun.jersey.test.framework.WebAppDescriptor; + +//import com.sun.jersey.spi.spring.container.servlet.SpringServlet; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("rest-context.xml") public class ProjectRestTest extends JerseyTest { - - private Logger logger = LoggerFactory.getLogger(ProjectRestTest.class); - - @Autowired - private ProjectsRepository projectsRepository; - - @Autowired - private SpacesRepository spacesRepository; - - @Autowired - private NodesRepository nodesRepository; - - @Autowired - private EdgesRepository edgesRepository; - - @Autowired - private ProjectRevisionsRepository projectRevisionsRepository; - - @Autowired - private MongoTemplate mongoTemplate; - - private Project testProject; - private List testNodes = new ArrayList(); - private List testEdges = new ArrayList<>(); - - private Date creationDate = new Date(); - - private String spaceId = UUID.randomUUID().toString(); - - public ProjectRestTest() { - } - - @Override - protected AppDescriptor configure() { - return new WebAppDescriptor.Builder("org.iri_research.renkan.rest") - .contextPath("rest") - .contextParam("contextConfigLocation", "classpath:/org/iri_research/renkan/test/rest/rest-context.xml") - .initParam("com.sun.jersey.config.property.packages", "org.iri_research.renkan.rest") - .servletClass(SpringServlet.class) - .contextListenerClass(ContextLoaderListener.class) - .build(); - }; - - @Before - public void setup() { + + private Logger logger = LoggerFactory.getLogger(ProjectRestTest.class); + + @Autowired + private ProjectsRepository projectsRepository; + + @Autowired + private SpacesRepository spacesRepository; + + @Autowired + private NodesRepository nodesRepository; + + @Autowired + private EdgesRepository edgesRepository; + + @Autowired + private ProjectRevisionsRepository projectRevisionsRepository; + + @Autowired + private MongoTemplate mongoTemplate; + + private Project testProject; + private List testNodes = new ArrayList(); + private List testEdges = new ArrayList<>(); + + private DateTime creationDate = new DateTime(); + + private String spaceId = UUID.randomUUID().toString(); + private String projectId = UUID.randomUUID().toString(); + + private ObjectMapper getObjectMapper() { + ObjectMapper mapper = new ObjectMapper(); + mapper.registerModule(new JodaModule()); + return mapper; + } + + public ProjectRestTest() { + } + + // @Override + // protected AppDescriptor configure() { + // return new WebAppDescriptor.Builder("org.iri_research.renkan.rest") + // .contextPath("rest") + // .contextParam("contextConfigLocation", + // "classpath:/org/iri_research/renkan/test/rest/rest-context.xml") + // .initParam("com.sun.jersey.config.property.packages", + // "org.iri_research.renkan.rest") + // .servletClass(SpringServlet.class) + // .contextListenerClass(ContextLoaderListener.class) + // .build(); + // }; + + @Override + protected Application configure() { + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ResourceConfig rc = new RestApplication() + .property("contextConfigLocation", + "classpath:/org/iri_research/renkan/test/rest/rest-context.xml"); + rc.setApplicationName("rest"); + return rc; + }; + + @Before + public void setup() { + + logger.debug("Setup"); + Space testSpace = new Space(this.spaceId, "test space", "Test space", + null, null, null, "test_user", null, this.creationDate); + testSpace = spacesRepository.save(testSpace); + testProject = new Project(testSpace.getId(), this.projectId, "test", "desc", + "http://localhost:8080/rest/projects/id", this.creationDate); + + for (int i = 0; i < 3; i++) { + Node node = new Node("Node" + i, "Node" + i, "Node " + i, + "http://renkan.org/nodes/node" + i, "#ffff0" + i, + "test_user", new Point(0, i), + "http://renkan.org/images/node" + i, i, testProject.getId()); + node = this.nodesRepository.save(node); + testProject.getNodes().add(node); + this.testNodes.add(node); + } - logger.debug("Setup"); - Space testSpace = new Space(this.spaceId, "test space", "Test space", null, null, null, "test_user", null, this.creationDate); - testSpace = spacesRepository.save(testSpace); - testProject = new Project(testSpace.getId(), UUID.randomUUID().toString(), "test", "desc", "http://localhost:8080/rest/projects/id", this.creationDate); - - for(int i=0;i<3;i++) { - Node node = new Node("Node"+i, "Node"+i, "Node "+i, "http://renkan.org/nodes/node"+i, "#ffff0"+i, "test_user", new Point(0, i), "http://renkan.org/images/node"+i, i, testProject.getId()); - node = this.nodesRepository.save(node); - testProject.getNodes().add(node); - this.testNodes.add(node); - } - - for(int i=0;i<3;i++) { - Edge edge = new Edge("Node"+i, "Node"+i, "Node "+i, "http://renkan.org/edges/edge"+i, "#ffff0"+i, this.testNodes.get((i+2)%3), this.testNodes.get(i), "test_user", testProject.getId()); - edge = this.edgesRepository.save(edge); - testProject.getEdges().add(edge); - this.testEdges.add(edge); - } - - this.projectsRepository.save(testProject); + for (int i = 0; i < 3; i++) { + Edge edge = new Edge("Node" + i, "Node" + i, "Node " + i, + "http://renkan.org/edges/edge" + i, "#ffff0" + i, + this.testNodes.get((i + 2) % 3), this.testNodes.get(i), + "test_user", testProject.getId()); + edge = this.edgesRepository.save(edge); + testProject.getEdges().add(edge); + this.testEdges.add(edge); + } + + this.projectsRepository.save(testProject); + + } - } - - @After - public void teardown() { - logger.debug("Teardown"); - edgesRepository.deleteAll(); - nodesRepository.deleteAll(); - projectRevisionsRepository.deleteAll(); - projectsRepository.deleteAll(); - spacesRepository.deleteAll(); - } - - - @Test - public void testDeleteProject() { + @After + public void teardown() { + logger.debug("Teardown"); + edgesRepository.deleteAll(); + nodesRepository.deleteAll(); + projectRevisionsRepository.deleteAll(); + projectsRepository.deleteAll(); + spacesRepository.deleteAll(); + } + + @Test + public void testGetProject() throws JsonProcessingException, IOException { + WebTarget webResource = this.target(); + String respString = webResource.path("projects") + .path(testProject.getId()).request().acceptEncoding("UTF-8").accept(MediaType.APPLICATION_JSON_TYPE).get(String.class); + Assert.assertNotNull("get resp String not empty", respString); + Assert.assertFalse("get resp String non empty", respString.isEmpty()); + + logger.debug("Test get Project : respString : " + respString); + + ObjectMapper mapper = this.getObjectMapper(); + + JsonNode projectNode = mapper.readTree(respString); + + Assert.assertNotNull("project node not null", projectNode); + + Assert.assertNotNull("Must have an id", projectNode.get("id")); + Assert.assertEquals("id must match", this.projectId, projectNode.get("id").asText()); + Assert.assertNotNull("Must have a created date", projectNode.get("created")); + Assert.assertEquals("creation date must match", this.creationDate.toString(ISODateTimeFormat.dateTime()), projectNode.get("created").asText()); + } - List nodes= testProject.getNodes(); - List edges= testProject.getEdges(); - - WebResource webResource = this.resource(); - String respString = webResource.path("projects").path(testProject.getId()).delete(String.class); - - Assert.assertTrue("Response text must contain deleted", respString.contains("deleted")); - Assert.assertTrue("Response text must contain id", respString.contains(this.testProject.getId())); - - DBObject filter = new BasicDBObject(); - filter.put("_id", testProject.getId()); - - DBCollection coll = mongoTemplate.getCollection(mongoTemplate.getCollectionName(Project.class)); - DBCursor resFind = coll.find(filter); - - Assert.assertEquals("The project must not be found", 0, resFind.count()); - - filter = new BasicDBObject(); - filter.put("project_id", testProject.getId()); - - DBCollection nodesColl = mongoTemplate.getCollection(mongoTemplate.getCollectionName(Node.class)); - resFind = nodesColl.find(filter); - - Assert.assertEquals("no nodes left", 0, resFind.count()); - - for(Node n: nodes) { - DBObject nobj = nodesColl.findOne(n.getId()); - Assert.assertNull("node should be deleted", nobj); - } + @Test + public void testDeleteProject() { + + List nodes = testProject.getNodes(); + List edges = testProject.getEdges(); + + WebTarget webResource = this.target(); + String respString = webResource.path("projects") + .path(testProject.getId()).request().delete(String.class); + + Assert.assertTrue("Response text must contain deleted", + respString.contains("deleted")); + Assert.assertTrue("Response text must contain id", + respString.contains(this.testProject.getId())); + + DBObject filter = new BasicDBObject(); + filter.put("_id", testProject.getId()); + + DBCollection coll = mongoTemplate.getCollection(mongoTemplate + .getCollectionName(Project.class)); + DBCursor resFind = coll.find(filter); + + Assert.assertEquals("The project must not be found", 0, resFind.count()); - - DBCollection edgesColl = mongoTemplate.getCollection(mongoTemplate.getCollectionName(Edge.class)); - resFind = edgesColl.find(filter); - - Assert.assertEquals("no edges left", 0, resFind.count()); - - for(Edge e: edges) { - DBObject eobj = edgesColl.findOne(e.getId()); - Assert.assertNull("edge should be deleted", eobj); - } - - } + filter = new BasicDBObject(); + filter.put("project_id", testProject.getId()); + + DBCollection nodesColl = mongoTemplate.getCollection(mongoTemplate + .getCollectionName(Node.class)); + resFind = nodesColl.find(filter); + + Assert.assertEquals("no nodes left", 0, resFind.count()); + for (Node n : nodes) { + DBObject nobj = nodesColl.findOne(n.getId()); + Assert.assertNull("node should be deleted", nobj); + } + + DBCollection edgesColl = mongoTemplate.getCollection(mongoTemplate + .getCollectionName(Edge.class)); + resFind = edgesColl.find(filter); + + Assert.assertEquals("no edges left", 0, resFind.count()); + + for (Edge e : edges) { + DBObject eobj = edgesColl.findOne(e.getId()); + Assert.assertNull("edge should be deleted", eobj); + } + + } } diff -r 2e738512336a -r 18a43ba77ad0 server/src/test/java/org/iri_research/renkan/test/rest/SpaceRestTest.java --- a/server/src/test/java/org/iri_research/renkan/test/rest/SpaceRestTest.java Fri Oct 25 16:42:11 2013 +0200 +++ b/server/src/test/java/org/iri_research/renkan/test/rest/SpaceRestTest.java Wed Jan 15 18:36:27 2014 +0100 @@ -2,22 +2,30 @@ import java.io.IOException; import java.net.URI; -import java.util.Date; import java.util.HashMap; import java.util.Map; +import java.util.TimeZone; import java.util.UUID; +import javax.ws.rs.client.Entity; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.Application; import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -import junit.framework.Assert; - +import org.glassfish.jersey.server.ResourceConfig; +import org.glassfish.jersey.server.model.Resource; +import org.glassfish.jersey.test.JerseyTest; import org.iri_research.renkan.models.Space; import org.iri_research.renkan.repositories.SpacesRepository; +import org.iri_research.renkan.rest.RestApplication; +import org.iri_research.renkan.rest.SpacesResource; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -26,762 +34,857 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.web.context.ContextLoaderListener; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.sun.jersey.api.client.ClientHandlerException; -import com.sun.jersey.api.client.ClientResponse; -import com.sun.jersey.api.client.UniformInterfaceException; -import com.sun.jersey.api.client.WebResource; -import com.sun.jersey.spi.spring.container.servlet.SpringServlet; -import com.sun.jersey.test.framework.AppDescriptor; -import com.sun.jersey.test.framework.JerseyTest; -import com.sun.jersey.test.framework.WebAppDescriptor; +import com.fasterxml.jackson.datatype.joda.JodaModule; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration("rest-context.xml") public class SpaceRestTest extends JerseyTest { - - private Logger logger = LoggerFactory.getLogger(SpaceRestTest.class); - - @Autowired - private SpacesRepository spacesRepository; - - private Map spacesList = new HashMap(); - private String firstSpaceUUID = null; - + + private Logger logger = LoggerFactory.getLogger(SpaceRestTest.class); + + @Autowired + private SpacesRepository spacesRepository; + + private Map spacesList = new HashMap(); + private String firstSpaceUUID = null; + + public SpaceRestTest() { + } + + // @Override + // protected AppDescriptor configure() { + // return new WebAppDescriptor.Builder("org.iri_research.renkan.rest") + // .contextPath("rest") + // .contextParam("contextConfigLocation", + // "classpath:/org/iri_research/renkan/test/rest/rest-context.xml") + // .initParam("com.sun.jersey.config.property.packages", + // "org.iri_research.renkan.rest") + // .servletClass(SpringServlet.class) + // .contextListenerClass(ContextLoaderListener.class) + // .build(); + // }; + + @Override + protected Application configure() { + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + ResourceConfig rc = new RestApplication() + .property("contextConfigLocation", + "classpath:/org/iri_research/renkan/test/rest/rest-context.xml"); + rc.setApplicationName("rest"); + return rc; + }; + + @Before + public void setup() { + + logger.debug("Setup"); + spacesRepository.deleteAll(); + DateTime creationDate = new DateTime(); + this.firstSpaceUUID = UUID.randomUUID().toString(); + Space testSpace = new Space(firstSpaceUUID, "test", "Test space", "{}", + "http://ldt.iri.centrepompidou.fr", "#ababab", "test_user", + "http://ldt.iri.centrepompidou.fr", creationDate); + testSpace = spacesRepository.save(testSpace); + this.spacesList.put(firstSpaceUUID, testSpace); - public SpaceRestTest() { - } - - @Override - protected AppDescriptor configure() { - return new WebAppDescriptor.Builder("org.iri_research.renkan.rest") - .contextPath("rest") - .contextParam("contextConfigLocation", "classpath:/org/iri_research/renkan/test/rest/rest-context.xml") - .initParam("com.sun.jersey.config.property.packages", "org.iri_research.renkan.rest") - .servletClass(SpringServlet.class) - .contextListenerClass(ContextLoaderListener.class) - .build(); - }; - - @Before - public void setup() { - - logger.debug("Setup"); - spacesRepository.deleteAll(); - Date creationDate = new Date(); - this.firstSpaceUUID = UUID.randomUUID().toString(); - Space testSpace = new Space(firstSpaceUUID, "test", "Test space", "{}", "http://ldt.iri.centrepompidou.fr", "#ababab", "test_user", "http://ldt.iri.centrepompidou.fr", creationDate); - testSpace = spacesRepository.save(testSpace); - this.spacesList.put(firstSpaceUUID, testSpace); - } - - @After - public void teardown() { - spacesRepository.deleteAll(); - } + Resource resource = Resource.builder(SpacesResource.class).build(); + String baseUri = resource.getPath(); + logger.debug("Path is " + baseUri); + for (Resource cres : resource.getChildResources()) { + logger.debug(cres.getAllMethods().toString() + " at " + baseUri + + "/" + cres.getPath()); + } + + } + + @After + public void teardown() { + spacesRepository.deleteAll(); + } + + @Test + public void testSetup() throws JsonProcessingException, IOException { + + WebTarget webTarget = this.target("spaces"); + String respString = webTarget.request().get(String.class); + + Assert.assertNotNull( + "The response string for the list of spaces must not be null", + respString); - - @Test - public void testSetup() throws JsonProcessingException, IOException { + logger.debug("RESPONSE : " + respString); + + Assert.assertTrue( + "The length of the space list resp. string must be > 0", + respString.length() > 0); + + ObjectMapper mapper = getObjectMapper(); + + JsonNode spacesList = mapper.readTree(respString); + + Assert.assertTrue("The spaceList must be an array", + spacesList.isArray()); + Assert.assertEquals( + "The spaceList length must be = " + this.spacesList.size(), + this.spacesList.size(), spacesList.size()); + + for (JsonNode jsonNode : spacesList) { + Assert.assertTrue("the space must have an id", + jsonNode.hasNonNull("id")); + String id = jsonNode.get("id").asText(); + Assert.assertTrue("The id must be in the spacesList", + this.spacesList.containsKey(id)); + Space space = this.spacesList.get(id); + Assert.assertNotNull( + "The object must in the spacesList must not be null", space); + + } - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").get(String.class); - - Assert.assertNotNull("The response string for the list of spaces must not be null", respString); - - logger.debug("RESPONSE : " + respString); - - Assert.assertTrue("The length of the space list resp. string must be > 0", respString.length() > 0); - - - ObjectMapper mapper = new ObjectMapper(); - JsonNode spacesList = mapper.readTree(respString); - - Assert.assertTrue("The spaceList must be an array", spacesList.isArray()); - Assert.assertEquals("The spaceList length must be = " + this.spacesList.size(), this.spacesList.size(), spacesList.size()); - - for (JsonNode jsonNode : spacesList) { - Assert.assertTrue("the space must have an id", jsonNode.hasNonNull("id")); - String id = jsonNode.get("id").asText(); - Assert.assertTrue("The id must be in the spacesList", this.spacesList.containsKey(id)); - Space space = this.spacesList.get(id); - Assert.assertNotNull("The object must in the spacesList must not be null", space); - - } - - } - - @Test - public void testTitle() throws JsonProcessingException, IOException { - - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode spacesList = mapper.readTree(respString); - - for (JsonNode jsonNode : spacesList) { - String id = jsonNode.get("_id").asText(); - Space space = this.spacesList.get(id); - - Assert.assertTrue("the space must have a title", jsonNode.hasNonNull("title")); - String title = jsonNode.get("title").asText(); - Assert.assertEquals("space title must be equals to " + space.getTitle(), space.getTitle(), title); - } + } + + @Test + public void testTitle() throws JsonProcessingException, IOException { + + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").request() + .get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + JsonNode spacesList = mapper.readTree(respString); + + for (JsonNode jsonNode : spacesList) { + String id = jsonNode.get("_id").asText(); + Space space = this.spacesList.get(id); + + Assert.assertTrue("the space must have a title", + jsonNode.hasNonNull("title")); + String title = jsonNode.get("title").asText(); + Assert.assertEquals( + "space title must be equals to " + space.getTitle(), + space.getTitle(), title); + } - } + } + + @Test + public void testDescription() throws JsonProcessingException, IOException { + + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").request() + .get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + JsonNode spacesList = mapper.readTree(respString); + + for (JsonNode jsonNode : spacesList) { + String id = jsonNode.get("id").asText(); + Space space = this.spacesList.get(id); + + Assert.assertTrue("the space must have a description", + jsonNode.hasNonNull("description")); + String description = jsonNode.get("description").asText(); + Assert.assertEquals( + "space description must be equals to " + + space.getDescription(), space.getDescription(), + description); + } + + } - @Test - public void testDescription() throws JsonProcessingException, IOException { - - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode spacesList = mapper.readTree(respString); - - for (JsonNode jsonNode : spacesList) { - String id = jsonNode.get("id").asText(); - Space space = this.spacesList.get(id); - - Assert.assertTrue("the space must have a description", jsonNode.hasNonNull("description")); - String description = jsonNode.get("description").asText(); - Assert.assertEquals("space description must be equals to " + space.getDescription(), space.getDescription(), description); - } + @Test + public void testUri() throws JsonProcessingException, IOException { + + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").request() + .get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + JsonNode spacesList = mapper.readTree(respString); - } + for (JsonNode jsonNode : spacesList) { + String id = jsonNode.get("id").asText(); + Space space = this.spacesList.get(id); + + Assert.assertTrue("the space must have a uri", + jsonNode.hasNonNull("uri")); + String uri = jsonNode.get("uri").asText(); + Assert.assertEquals( + "space uri must be equals to " + space.getUri(), + space.getUri(), uri); + } + + } - @Test - public void testUri() throws JsonProcessingException, IOException { - - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode spacesList = mapper.readTree(respString); - - for (JsonNode jsonNode : spacesList) { - String id = jsonNode.get("id").asText(); - Space space = this.spacesList.get(id); - - Assert.assertTrue("the space must have a uri", jsonNode.hasNonNull("uri")); - String uri = jsonNode.get("uri").asText(); - Assert.assertEquals("space uri must be equals to " + space.getUri(), space.getUri(), uri); - } + @Test + public void testColor() throws JsonProcessingException, IOException { - } + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").request() + .get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + mapper.registerModule(new JodaModule()); + JsonNode spacesList = mapper.readTree(respString); - @Test - public void testColor() throws JsonProcessingException, IOException { - - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode spacesList = mapper.readTree(respString); - - for (JsonNode jsonNode : spacesList) { - String id = jsonNode.get("id").asText(); - Space space = this.spacesList.get(id); - - Assert.assertTrue("the space must have a color", jsonNode.hasNonNull("color")); - String color = jsonNode.get("color").asText(); - Assert.assertEquals("space color must be equals to " + space.getColor(), space.getColor(), color); - } + for (JsonNode jsonNode : spacesList) { + String id = jsonNode.get("id").asText(); + Space space = this.spacesList.get(id); - } + Assert.assertTrue("the space must have a color", + jsonNode.hasNonNull("color")); + String color = jsonNode.get("color").asText(); + Assert.assertEquals( + "space color must be equals to " + space.getColor(), + space.getColor(), color); + } + + } + + @Test + public void testBinConfig() throws JsonProcessingException, IOException { - - - @Test - public void testBinConfig() throws JsonProcessingException, IOException { - - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode spacesList = mapper.readTree(respString); - - for (JsonNode jsonNode : spacesList) { - String id = jsonNode.get("id").asText(); - Space space = this.spacesList.get(id); - - Assert.assertTrue("the space must have a bin_config", jsonNode.hasNonNull("bin_config")); - String binConfig = jsonNode.get("bin_config").asText(); - Assert.assertEquals("space bin_config must be equals to " + space.getBinConfig(), space.getBinConfig(), binConfig); - } + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").request() + .get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + + JsonNode spacesList = mapper.readTree(respString); + + for (JsonNode jsonNode : spacesList) { + String id = jsonNode.get("id").asText(); + Space space = this.spacesList.get(id); + + Assert.assertTrue("the space must have a bin_config", + jsonNode.hasNonNull("bin_config")); + String binConfig = jsonNode.get("bin_config").asText(); + Assert.assertEquals( + "space bin_config must be equals to " + + space.getBinConfig(), space.getBinConfig(), + binConfig); + } + + } + + private ObjectMapper getObjectMapper() { + ObjectMapper mapper = new ObjectMapper(); + mapper.registerModule(new JodaModule()); + return mapper; + } + + @Test + public void testCreatedBy() throws JsonProcessingException, IOException { + + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").request() + .get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + JsonNode spacesList = mapper.readTree(respString); + + for (JsonNode jsonNode : spacesList) { + String id = jsonNode.get("id").asText(); + Space space = this.spacesList.get(id); + + Assert.assertTrue("the space must have a created_by", + jsonNode.hasNonNull("created_by")); + String createdBy = jsonNode.get("created_by").asText(); + Assert.assertEquals( + "space created_by must be equals to " + + space.getCreatedBy(), space.getCreatedBy(), + createdBy); + } - } - - @Test - public void testCreatedBy() throws JsonProcessingException, IOException { - - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode spacesList = mapper.readTree(respString); - - for (JsonNode jsonNode : spacesList) { - String id = jsonNode.get("id").asText(); - Space space = this.spacesList.get(id); - - Assert.assertTrue("the space must have a created_by", jsonNode.hasNonNull("created_by")); - String createdBy = jsonNode.get("created_by").asText(); - Assert.assertEquals("space created_by must be equals to " + space.getCreatedBy(), space.getCreatedBy(), createdBy); - } + } + + @Test + public void testCreated() throws JsonProcessingException, IOException { + + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").request() + .get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + JsonNode spacesList = mapper.readTree(respString); + + for (JsonNode jsonNode : spacesList) { + String id = jsonNode.get("id").asText(); + Space space = this.spacesList.get(id); + + Assert.assertTrue("the space must have a created", + jsonNode.hasNonNull("created")); + + String dateStr = jsonNode.get("created").asText(); + + DateTimeFormatter fmt = ISODateTimeFormat.dateTime(); + DateTime date = fmt.parseDateTime(dateStr); + + Assert.assertEquals("Created date must be the same", + space.getCreated(), date); - } - - - @Test - public void testCreated() throws JsonProcessingException, IOException { - - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode spacesList = mapper.readTree(respString); - - for (JsonNode jsonNode : spacesList) { - String id = jsonNode.get("id").asText(); - Space space = this.spacesList.get(id); - - Assert.assertTrue("the space must have a created", jsonNode.hasNonNull("created")); - - String dateStr = jsonNode.get("created").asText(); - - DateTimeFormatter fmt = ISODateTimeFormat.dateTime(); - DateTime date = fmt.parseDateTime(dateStr); - - Assert.assertEquals("Created date must be the same", space.getCreated(), date.toDate()); - - } + } + + } + + @Test + public void testImage() throws JsonProcessingException, IOException { + + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").request() + .get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + JsonNode spacesList = mapper.readTree(respString); + + for (JsonNode jsonNode : spacesList) { + String id = jsonNode.get("id").asText(); + Space space = this.spacesList.get(id); + + Assert.assertTrue("the space must have a image", + jsonNode.hasNonNull("image")); + String image = jsonNode.get("image").asText(); + Assert.assertEquals( + "space image must be equals to " + space.getImage(), + space.getImage(), image); + } + + } - } - - @Test - public void testImage() throws JsonProcessingException, IOException { - - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode spacesList = mapper.readTree(respString); - - for (JsonNode jsonNode : spacesList) { - String id = jsonNode.get("id").asText(); - Space space = this.spacesList.get(id); - - Assert.assertTrue("the space must have a image", jsonNode.hasNonNull("image")); - String image = jsonNode.get("image").asText(); - Assert.assertEquals("space image must be equals to " + space.getImage(), space.getImage(), image); - } + @Test + public void testSingleCreated() throws JsonProcessingException, IOException { + + Space space = this.spacesList.get(this.firstSpaceUUID); + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").path(this.firstSpaceUUID) + .request().accept(MediaType.APPLICATION_JSON).get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + JsonNode jsonNode = mapper.readTree(respString); + + String id = jsonNode.get("id").asText(); + Assert.assertEquals("id must be equals", space.getId(), id); + + Assert.assertTrue("the space must have a created", + jsonNode.hasNonNull("created")); + + String dateStr = jsonNode.get("created").asText(); + + DateTimeFormatter fmt = ISODateTimeFormat.dateTime(); + DateTime date = fmt.parseDateTime(dateStr); + + Assert.assertEquals("Created date must be the same", + space.getCreated(), date); - } - - @Test - public void testSingleCreated() throws JsonProcessingException, IOException { - - Space space = this.spacesList.get(this.firstSpaceUUID); - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").path(this.firstSpaceUUID).accept(MediaType.APPLICATION_JSON).get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode jsonNode = mapper.readTree(respString); - - String id = jsonNode.get("id").asText(); - Assert.assertEquals("id must be equals", space.getId(), id); - - Assert.assertTrue("the space must have a created", jsonNode.hasNonNull("created")); - - String dateStr = jsonNode.get("created").asText(); - - DateTimeFormatter fmt = ISODateTimeFormat.dateTime(); - DateTime date = fmt.parseDateTime(dateStr); - - Assert.assertEquals("Created date must be the same", space.getCreated(), date.toDate()); + } + + @Test + public void testSingleTitle() throws JsonProcessingException, IOException { + + Space space = this.spacesList.get(this.firstSpaceUUID); + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").path(this.firstSpaceUUID) + .request().accept(MediaType.APPLICATION_JSON).get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + JsonNode jsonNode = mapper.readTree(respString); + + Assert.assertTrue("the space must have a title", + jsonNode.hasNonNull("title")); + String title = jsonNode.get("title").asText(); + Assert.assertEquals( + "space title must be equals to " + space.getTitle(), + space.getTitle(), title); + } + + @Test + public void testSingleDescription() throws JsonProcessingException, + IOException { - } - - @Test - public void testSingleTitle() throws JsonProcessingException, IOException { - - Space space = this.spacesList.get(this.firstSpaceUUID); - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").path(this.firstSpaceUUID).accept(MediaType.APPLICATION_JSON).get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode jsonNode = mapper.readTree(respString); - - Assert.assertTrue("the space must have a title", jsonNode.hasNonNull("title")); - String title = jsonNode.get("title").asText(); - Assert.assertEquals("space title must be equals to " + space.getTitle(), space.getTitle(), title); - } + Space space = this.spacesList.get(this.firstSpaceUUID); + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").path(this.firstSpaceUUID) + .request().accept(MediaType.APPLICATION_JSON).get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + JsonNode jsonNode = mapper.readTree(respString); + + Assert.assertTrue("the space must have a description", + jsonNode.hasNonNull("description")); + String description = jsonNode.get("description").asText(); + Assert.assertEquals( + "space description must be equals to " + space.getDescription(), + space.getDescription(), description); + } + + @Test + public void testSingleUri() throws JsonProcessingException, IOException { + + Space space = this.spacesList.get(this.firstSpaceUUID); + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").path(this.firstSpaceUUID) + .request().accept(MediaType.APPLICATION_JSON).get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + JsonNode jsonNode = mapper.readTree(respString); - @Test - public void testSingleDescription() throws JsonProcessingException, IOException { - - Space space = this.spacesList.get(this.firstSpaceUUID); - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").path(this.firstSpaceUUID).accept(MediaType.APPLICATION_JSON).get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode jsonNode = mapper.readTree(respString); - - Assert.assertTrue("the space must have a description", jsonNode.hasNonNull("description")); - String description = jsonNode.get("description").asText(); - Assert.assertEquals("space description must be equals to " + space.getDescription(), space.getDescription(), description); - } + Assert.assertTrue("the space must have a uri", + jsonNode.hasNonNull("uri")); + String uri = jsonNode.get("uri").asText(); + Assert.assertEquals("space uri must be equals to " + space.getUri(), + space.getUri(), uri); + } + + @Test + public void testSingleColor() throws JsonProcessingException, IOException { - @Test - public void testSingleUri() throws JsonProcessingException, IOException { - - Space space = this.spacesList.get(this.firstSpaceUUID); - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").path(this.firstSpaceUUID).accept(MediaType.APPLICATION_JSON).get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode jsonNode = mapper.readTree(respString); - - Assert.assertTrue("the space must have a uri", jsonNode.hasNonNull("uri")); - String uri = jsonNode.get("uri").asText(); - Assert.assertEquals("space uri must be equals to " + space.getUri(), space.getUri(), uri); - } + Space space = this.spacesList.get(this.firstSpaceUUID); + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").path(this.firstSpaceUUID) + .request().accept(MediaType.APPLICATION_JSON).get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + JsonNode jsonNode = mapper.readTree(respString); - @Test - public void testSingleColor() throws JsonProcessingException, IOException { - - Space space = this.spacesList.get(this.firstSpaceUUID); - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").path(this.firstSpaceUUID).accept(MediaType.APPLICATION_JSON).get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode jsonNode = mapper.readTree(respString); - - Assert.assertTrue("the space must have a color", jsonNode.hasNonNull("color")); - String color = jsonNode.get("color").asText(); - Assert.assertEquals("space color must be equals to " + space.getColor(), space.getColor(), color); - } + Assert.assertTrue("the space must have a color", + jsonNode.hasNonNull("color")); + String color = jsonNode.get("color").asText(); + Assert.assertEquals( + "space color must be equals to " + space.getColor(), + space.getColor(), color); + } + + @Test + public void testSingleBinConfig() throws JsonProcessingException, + IOException { - - - @Test - public void testSingleBinConfig() throws JsonProcessingException, IOException { - - Space space = this.spacesList.get(this.firstSpaceUUID); - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").path(this.firstSpaceUUID).accept(MediaType.APPLICATION_JSON).get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode jsonNode = mapper.readTree(respString); - - Assert.assertTrue("the space must have a bin_config", jsonNode.hasNonNull("bin_config")); - String binConfig = jsonNode.get("bin_config").asText(); - Assert.assertEquals("space bin_config must be equals to " + space.getBinConfig(), space.getBinConfig(), binConfig); - } - - @Test - public void testSingleCreatedBy() throws JsonProcessingException, IOException { - - Space space = this.spacesList.get(this.firstSpaceUUID); - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").path(this.firstSpaceUUID).accept(MediaType.APPLICATION_JSON).get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode jsonNode = mapper.readTree(respString); - - Assert.assertTrue("the space must have a created_by", jsonNode.hasNonNull("created_by")); - String createdBy = jsonNode.get("created_by").asText(); - Assert.assertEquals("space created_by must be equals to " + space.getCreatedBy(), space.getCreatedBy(), createdBy); - } - - - @Test - public void testSingleImage() throws JsonProcessingException, IOException { - - Space space = this.spacesList.get(this.firstSpaceUUID); - WebResource webResource = this.resource(); - String respString = webResource.path("spaces").path(this.firstSpaceUUID).accept(MediaType.APPLICATION_JSON).get(String.class); - logger.debug("RESPONSE : " + respString); - ObjectMapper mapper = new ObjectMapper(); - JsonNode jsonNode = mapper.readTree(respString); - - Assert.assertTrue("the space must have a image", jsonNode.hasNonNull("image")); - String image = jsonNode.get("image").asText(); - Assert.assertEquals("space image must be equals to " + space.getImage(), space.getImage(), image); - } - - - @Test - public void testPost() throws JsonProcessingException, ClientHandlerException, UniformInterfaceException, IOException { - - String title = "test_post"; - String description = "test space post"; - String uri = "http://ldt.iri.centrepompidou.fr/test_post"; - String color = "#bcbcbc"; - String image = "http://ldt.iri.centrepompidou.fr/test_post/image"; - String created = "2013-01-01T01:01:01.001+0000"; - String bin_config = "{name: 'test_post_config'}"; - String created_by = "test_user_post"; - - String spaceJson = String.format("{" + - "\"title\":\"%s\"," + - "\"description\":\"%s\"," + - "\"uri\":\"%s\"," + - "\"color\":\"%s\"," + - "\"image\":\"%s\"," + - "\"created\":\"%s\"," + - "\"bin_config\":\"%s\"," + - "\"created_by\":\"%s\"" + - "}", - title, - description, - uri, - color, - image, - created, - bin_config, - created_by); - - WebResource webResource = this.resource(); - ClientResponse resp = webResource.path("spaces").type(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON).entity(spaceJson).post(ClientResponse.class); - - String respStr = resp.getEntity(String.class); - - Assert.assertEquals("Resp status = created : " + respStr, Status.CREATED.getStatusCode(), resp.getStatus()); - Assert.assertTrue("Resp must be application/json", resp.getType().isCompatible(MediaType.APPLICATION_JSON_TYPE)); - - ObjectMapper mapper = new ObjectMapper(); - JsonNode objNode = mapper.readTree(respStr); + Space space = this.spacesList.get(this.firstSpaceUUID); + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").path(this.firstSpaceUUID) + .request().accept(MediaType.APPLICATION_JSON).get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + JsonNode jsonNode = mapper.readTree(respString); + + Assert.assertTrue("the space must have a bin_config", + jsonNode.hasNonNull("bin_config")); + String binConfig = jsonNode.get("bin_config").asText(); + Assert.assertEquals( + "space bin_config must be equals to " + space.getBinConfig(), + space.getBinConfig(), binConfig); + } + + @Test + public void testSingleCreatedBy() throws JsonProcessingException, + IOException { + + Space space = this.spacesList.get(this.firstSpaceUUID); + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").path(this.firstSpaceUUID) + .request().accept(MediaType.APPLICATION_JSON).get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + JsonNode jsonNode = mapper.readTree(respString); + + Assert.assertTrue("the space must have a created_by", + jsonNode.hasNonNull("created_by")); + String createdBy = jsonNode.get("created_by").asText(); + Assert.assertEquals( + "space created_by must be equals to " + space.getCreatedBy(), + space.getCreatedBy(), createdBy); + } + + @Test + public void testSingleImage() throws JsonProcessingException, IOException { + + Space space = this.spacesList.get(this.firstSpaceUUID); + WebTarget WebTarget = this.target(); + String respString = WebTarget.path("spaces").path(this.firstSpaceUUID) + .request().accept(MediaType.APPLICATION_JSON).get(String.class); + logger.debug("RESPONSE : " + respString); + ObjectMapper mapper = getObjectMapper(); + JsonNode jsonNode = mapper.readTree(respString); + + Assert.assertTrue("the space must have a image", + jsonNode.hasNonNull("image")); + String image = jsonNode.get("image").asText(); + Assert.assertEquals( + "space image must be equals to " + space.getImage(), + space.getImage(), image); + } + + @Test + public void testPost() throws JsonProcessingException, IOException { + + String title = "test_post"; + String description = "test space post"; + String uri = "http://ldt.iri.centrepompidou.fr/test_post"; + String color = "#bcbcbc"; + String image = "http://ldt.iri.centrepompidou.fr/test_post/image"; + String created = "2013-01-01T01:01:01.001+0000"; + String expectedCreated = "2013-01-01T01:01:01.001Z"; + String bin_config = "{name: 'test_post_config'}"; + String created_by = "test_user_post"; + + String spaceJson = String.format("{" + "\"title\":\"%s\"," + + "\"description\":\"%s\"," + "\"uri\":\"%s\"," + + "\"color\":\"%s\"," + "\"image\":\"%s\"," + + "\"created\":\"%s\"," + "\"bin_config\":\"%s\"," + + "\"created_by\":\"%s\"" + "}", title, description, uri, + color, image, created, bin_config, created_by); + + WebTarget webTarget = this.target(); + Response resp = webTarget.path("spaces").request() + .accept(MediaType.APPLICATION_JSON) + .post(Entity.entity(spaceJson, MediaType.APPLICATION_JSON)); + + String respStr = resp.readEntity(String.class); + + Assert.assertEquals("Resp status = created : " + respStr, + Status.CREATED.getStatusCode(), resp.getStatus()); + Assert.assertTrue("Resp must be application/json", resp.getMediaType() + .isCompatible(MediaType.APPLICATION_JSON_TYPE)); + + ObjectMapper mapper = getObjectMapper(); + JsonNode objNode = mapper.readTree(respStr); + + Assert.assertTrue("the space must have an id", objNode.hasNonNull("id")); + String idStr = objNode.get("id").asText(); + Assert.assertFalse("The id str must not be empty", idStr.length() == 0); + + Assert.assertTrue("the space must have a title", + objNode.hasNonNull("title")); + String titleStr = objNode.get("title").asText(); + Assert.assertEquals("space title must be equals to " + title, title, + titleStr); + + Assert.assertTrue("the space must have a description", + objNode.hasNonNull("description")); + String descriptionStr = objNode.get("description").asText(); + Assert.assertEquals("space description must be equals to " + + description, description, descriptionStr); - Assert.assertTrue("the space must have an id", objNode.hasNonNull("id")); - String idStr = objNode.get("id").asText(); - Assert.assertFalse("The id str must not be empty", idStr.length()==0); - - Assert.assertTrue("the space must have a title", objNode.hasNonNull("title")); - String titleStr = objNode.get("title").asText(); - Assert.assertEquals("space title must be equals to " + title, title, titleStr); + Assert.assertTrue("the space must have a uri", + objNode.hasNonNull("uri")); + String uriStr = objNode.get("uri").asText(); + Assert.assertEquals("space uri must be equals to " + uri, uri, uriStr); + + Assert.assertTrue("the space must have a color", + objNode.hasNonNull("color")); + String colorStr = objNode.get("color").asText(); + Assert.assertEquals("space color must be equals to " + color, color, + colorStr); - Assert.assertTrue("the space must have a description", objNode.hasNonNull("description")); - String descriptionStr = objNode.get("description").asText(); - Assert.assertEquals("space description must be equals to " + description, description, descriptionStr); + Assert.assertTrue("the space must have a bin_config", + objNode.hasNonNull("bin_config")); + String bin_configStr = objNode.get("bin_config").asText(); + Assert.assertEquals("space bin_config must be equals to " + bin_config, + bin_config, bin_configStr); + + Assert.assertTrue("the space must have a created_by", + objNode.hasNonNull("created_by")); + String created_byStr = objNode.get("created_by").asText(); + Assert.assertEquals("space created_by must be equals to " + created_by, + created_by, created_byStr); - Assert.assertTrue("the space must have a uri", objNode.hasNonNull("uri")); - String uriStr = objNode.get("uri").asText(); - Assert.assertEquals("space uri must be equals to " + uri, uri, uriStr); + Assert.assertTrue("the space must have a created", + objNode.hasNonNull("created")); + String createdStr = objNode.get("created").asText(); + Assert.assertEquals("space created must be equals to " + expectedCreated, + expectedCreated, createdStr); + + // object must be created + Space sp = this.spacesRepository.findOne(idStr); + + Assert.assertNotNull("Space object must be in rep", sp); - Assert.assertTrue("the space must have a color", objNode.hasNonNull("color")); - String colorStr = objNode.get("color").asText(); - Assert.assertEquals("space color must be equals to " + color, color, colorStr); + Assert.assertEquals("space title must be equals to " + title, title, + sp.getTitle()); + Assert.assertEquals("space description must be equals to " + + description, description, sp.getDescription()); + Assert.assertEquals("space uri must be equals to " + uri, uri, + sp.getUri()); + Assert.assertEquals("space color must be equals to " + color, color, + sp.getColor()); + Assert.assertEquals("space bin_config must be equals to " + bin_config, + bin_config, sp.getBinConfig()); + Assert.assertEquals("space created_by must be equals to " + created_by, + created_by, sp.getCreatedBy()); + DateTimeFormatter fmt = ISODateTimeFormat.dateTime(); + DateTime created_date = fmt.parseDateTime(created); + Assert.assertEquals("space created must be equals to " + created, + created_date, sp.getCreated()); - Assert.assertTrue("the space must have a bin_config", objNode.hasNonNull("bin_config")); - String bin_configStr = objNode.get("bin_config").asText(); - Assert.assertEquals("space bin_config must be equals to " + bin_config, bin_config, bin_configStr); + } - Assert.assertTrue("the space must have a created_by", objNode.hasNonNull("created_by")); - String created_byStr = objNode.get("created_by").asText(); - Assert.assertEquals("space created_by must be equals to " + created_by, created_by, created_byStr); - - Assert.assertTrue("the space must have a created", objNode.hasNonNull("created")); - String createdStr = objNode.get("created").asText(); - Assert.assertEquals("space created must be equals to " + created, created, createdStr); - - // object must be created - Space sp = this.spacesRepository.findOne(idStr); - - Assert.assertNotNull("Space object must be in rep", sp); - - Assert.assertEquals("space title must be equals to " + title, title, sp.getTitle()); - Assert.assertEquals("space description must be equals to " + description, description, sp.getDescription()); - Assert.assertEquals("space uri must be equals to " + uri, uri, sp.getUri()); - Assert.assertEquals("space color must be equals to " + color, color, sp.getColor()); - Assert.assertEquals("space bin_config must be equals to " + bin_config, bin_config, sp.getBinConfig()); - Assert.assertEquals("space created_by must be equals to " + created_by, created_by, sp.getCreatedBy()); - DateTimeFormatter fmt = ISODateTimeFormat.dateTime(); - DateTime created_date = fmt.parseDateTime(created); - Assert.assertEquals("space created must be equals to " + created, created_date.toDate(), sp.getCreated()); - - } + @Test + public void testPostWithId() { + + String id = UUID.randomUUID().toString(); + String title = "test_post"; + String description = "test space post"; + String uri = "http://ldt.iri.centrepompidou.fr/test_post"; + String color = "#bcbcbc"; + String image = "http://ldt.iri.centrepompidou.fr/test_post/image"; + String created = "2013-01-01T01:01:01.001+0000"; + String bin_config = "{name: 'test_post_config'}"; + String created_by = "test_user_post"; + + String spaceJson = String.format("{" + "\"id\":\"%s\"," + + "\"title\":\"%s\"," + "\"description\":\"%s\"," + + "\"uri\":\"%s\"," + "\"color\":\"%s\"," + "\"image\":\"%s\"," + + "\"created\":\"%s\"," + "\"bin_config\":\"%s\"," + + "\"created_by\":\"%s\"" + "}", id, title, description, uri, + color, image, created, bin_config, created_by); + + WebTarget WebTarget = this.target(); + Response resp = WebTarget.path("spaces").request() + .accept(MediaType.APPLICATION_JSON) + .post(Entity.entity(spaceJson, MediaType.APPLICATION_JSON)); + + String respStr = resp.readEntity(String.class); + + Assert.assertEquals("Resp status = Bad Request : " + respStr, + Status.BAD_REQUEST.getStatusCode(), resp.getStatus()); + Assert.assertEquals("Error message", "Id in JSON must be null", respStr); + + } + + @Test + public void testPut() throws JsonProcessingException, IOException { + + String id = this.firstSpaceUUID; + String title = "test_post"; + String description = "test space put"; + String uri = "http://ldt.iri.centrepompidou.fr/test_put"; + String color = "#bcbcbc"; + String image = "http://ldt.iri.centrepompidou.fr/test_put/image"; + String created = "2013-01-01T01:01:01.001+0000"; + String bin_config = "{name: 'test_put_config'}"; + String created_by = "test_user_put"; + + String spaceJson = String.format("{" + "\"id\":\"%s\"," + + "\"title\":\"%s\"," + "\"description\":\"%s\"," + + "\"uri\":\"%s\"," + "\"color\":\"%s\"," + "\"image\":\"%s\"," + + "\"created\":\"%s\"," + "\"bin_config\":\"%s\"," + + "\"created_by\":\"%s\"" + "}", id, title, description, uri, + color, image, created, bin_config, created_by); - - @Test - public void testPostWithId() { - - String id = UUID.randomUUID().toString(); - String title = "test_post"; - String description = "test space post"; - String uri = "http://ldt.iri.centrepompidou.fr/test_post"; - String color = "#bcbcbc"; - String image = "http://ldt.iri.centrepompidou.fr/test_post/image"; - String created = "2013-01-01T01:01:01.001+0000"; - String bin_config = "{name: 'test_post_config'}"; - String created_by = "test_user_post"; - - String spaceJson = String.format("{" + - "\"id\":\"%s\"," + - "\"title\":\"%s\"," + - "\"description\":\"%s\"," + - "\"uri\":\"%s\"," + - "\"color\":\"%s\"," + - "\"image\":\"%s\"," + - "\"created\":\"%s\"," + - "\"bin_config\":\"%s\"," + - "\"created_by\":\"%s\"" + - "}", - id, - title, - description, - uri, - color, - image, - created, - bin_config, - created_by); - - WebResource webResource = this.resource(); - ClientResponse resp = webResource.path("spaces").type(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON).entity(spaceJson).post(ClientResponse.class); - - String respStr = resp.getEntity(String.class); - - Assert.assertEquals("Resp status = Bad Request : " + respStr, Status.BAD_REQUEST.getStatusCode(), resp.getStatus()); - Assert.assertEquals("Error message", "Id in JSON must be null", respStr); - - } - - @Test - public void testPut() throws JsonProcessingException, IOException { - - String id = this.firstSpaceUUID; - String title = "test_post"; - String description = "test space put"; - String uri = "http://ldt.iri.centrepompidou.fr/test_put"; - String color = "#bcbcbc"; - String image = "http://ldt.iri.centrepompidou.fr/test_put/image"; - String created = "2013-01-01T01:01:01.001+0000"; - String bin_config = "{name: 'test_put_config'}"; - String created_by = "test_user_put"; - - String spaceJson = String.format("{" + - "\"id\":\"%s\"," + - "\"title\":\"%s\"," + - "\"description\":\"%s\"," + - "\"uri\":\"%s\"," + - "\"color\":\"%s\"," + - "\"image\":\"%s\"," + - "\"created\":\"%s\"," + - "\"bin_config\":\"%s\"," + - "\"created_by\":\"%s\"" + - "}", - id, - title, - description, - uri, - color, - image, - created, - bin_config, - created_by); - - WebResource webResource = this.resource(); - ClientResponse resp = webResource.path("spaces").path(this.firstSpaceUUID).type(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON).entity(spaceJson).put(ClientResponse.class); - - String respStr = ""; - - if(resp.getStatus() != 204) { - respStr = resp.getEntity(String.class); - } - - Assert.assertEquals("Resp status = created : " + respStr, Status.NO_CONTENT.getStatusCode(), resp.getStatus()); - Assert.assertNull("Resp type must be null", resp.getType()); + WebTarget WebTarget = this.target(); + Response resp = WebTarget.path("spaces").path(this.firstSpaceUUID) + .request()// type(MediaType.APPLICATION_JSON) + .accept(MediaType.APPLICATION_JSON)// .entity(spaceJson) + .put(Entity.entity(spaceJson, MediaType.APPLICATION_JSON)); + + String respStr = ""; + + if (resp.getStatus() != 204) { + respStr = resp.readEntity(String.class); + } + + Assert.assertEquals("Resp status = created : " + respStr, + Status.NO_CONTENT.getStatusCode(), resp.getStatus()); + Assert.assertNull("Resp type must be null", resp.getMediaType()); + + // object must be updated + Space sp = this.spacesRepository.findOne(id); + + Assert.assertNotNull("Space object must be in rep", sp); + + Assert.assertEquals("space title must be equals to " + title, title, + sp.getTitle()); + Assert.assertEquals("space description must be equals to " + + description, description, sp.getDescription()); + Assert.assertEquals("space uri must be equals to " + uri, uri, + sp.getUri()); + Assert.assertEquals("space color must be equals to " + color, color, + sp.getColor()); + Assert.assertEquals("space bin_config must be equals to " + bin_config, + bin_config, sp.getBinConfig()); + Assert.assertEquals("space created_by must be equals to " + created_by, + created_by, sp.getCreatedBy()); + DateTimeFormatter fmt = ISODateTimeFormat.dateTime(); + DateTime created_date = fmt.parseDateTime(created); + Assert.assertEquals("space created must be equals to " + created, + created_date, sp.getCreated()); + + } + + @Test + public void testPutWithoutId() { + + String title = "test_put"; + String description = "test space put"; + String uri = "http://ldt.iri.centrepompidou.fr/test_put"; + String color = "#bcbcbc"; + String image = "http://ldt.iri.centrepompidou.fr/test_put/image"; + String created = "2013-01-01T01:01:01.001+0000"; + String bin_config = "{name: 'test_put_config'}"; + String created_by = "test_user_put"; - - // object must be updated - Space sp = this.spacesRepository.findOne(id); - - Assert.assertNotNull("Space object must be in rep", sp); - - Assert.assertEquals("space title must be equals to " + title, title, sp.getTitle()); - Assert.assertEquals("space description must be equals to " + description, description, sp.getDescription()); - Assert.assertEquals("space uri must be equals to " + uri, uri, sp.getUri()); - Assert.assertEquals("space color must be equals to " + color, color, sp.getColor()); - Assert.assertEquals("space bin_config must be equals to " + bin_config, bin_config, sp.getBinConfig()); - Assert.assertEquals("space created_by must be equals to " + created_by, created_by, sp.getCreatedBy()); - DateTimeFormatter fmt = ISODateTimeFormat.dateTime(); - DateTime created_date = fmt.parseDateTime(created); - Assert.assertEquals("space created must be equals to " + created, created_date.toDate(), sp.getCreated()); + String spaceJson = String.format("{" + "\"title\":\"%s\"," + + "\"description\":\"%s\"," + "\"uri\":\"%s\"," + + "\"color\":\"%s\"," + "\"image\":\"%s\"," + + "\"created\":\"%s\"," + "\"bin_config\":\"%s\"," + + "\"created_by\":\"%s\"" + "}", title, description, uri, + color, image, created, bin_config, created_by); + + WebTarget WebTarget = this.target(); + Response resp = WebTarget.path("spaces").path(this.firstSpaceUUID) + .request().accept(MediaType.APPLICATION_JSON) + .put(Entity.entity(spaceJson, MediaType.APPLICATION_JSON)); + + String respStr = resp.readEntity(String.class); + + Assert.assertEquals("Resp status = Bad Request : " + respStr, + Status.BAD_REQUEST.getStatusCode(), resp.getStatus()); + Assert.assertEquals("Error message", + "Id parameter and id in JSON do not match", respStr); + } + + @Test + public void testPutBadId() { - } - - @Test - public void testPutWithoutId() { + String id = UUID.randomUUID().toString(); + String title = "test_post"; + String description = "test space put"; + String uri = "http://ldt.iri.centrepompidou.fr/test_put"; + String color = "#bcbcbc"; + String image = "http://ldt.iri.centrepompidou.fr/test_put/image"; + String created = "2013-01-01T01:01:01.001+0000"; + String bin_config = "{name: 'test_put_config'}"; + String created_by = "test_user_put"; + + String spaceJson = String.format("{" + "\"id\":\"%s\"," + + "\"title\":\"%s\"," + "\"description\":\"%s\"," + + "\"uri\":\"%s\"," + "\"color\":\"%s\"," + "\"image\":\"%s\"," + + "\"created\":\"%s\"," + "\"bin_config\":\"%s\"," + + "\"created_by\":\"%s\"" + "}", id, title, description, uri, + color, image, created, bin_config, created_by); + + WebTarget WebTarget = this.target(); + Response resp = WebTarget.path("spaces").path(id) + .request(MediaType.APPLICATION_JSON) + .accept(MediaType.APPLICATION_JSON) + .put(Entity.entity(spaceJson, MediaType.APPLICATION_JSON)); + + String respStr = resp.readEntity(String.class); + + Assert.assertEquals("Resp status = Bad Request : " + respStr, + Status.NOT_FOUND.getStatusCode(), resp.getStatus()); + + } + + @Test + public void testDelete() { - String title = "test_put"; - String description = "test space put"; - String uri = "http://ldt.iri.centrepompidou.fr/test_put"; - String color = "#bcbcbc"; - String image = "http://ldt.iri.centrepompidou.fr/test_put/image"; - String created = "2013-01-01T01:01:01.001+0000"; - String bin_config = "{name: 'test_put_config'}"; - String created_by = "test_user_put"; - - String spaceJson = String.format("{" + - "\"title\":\"%s\"," + - "\"description\":\"%s\"," + - "\"uri\":\"%s\"," + - "\"color\":\"%s\"," + - "\"image\":\"%s\"," + - "\"created\":\"%s\"," + - "\"bin_config\":\"%s\"," + - "\"created_by\":\"%s\"" + - "}", - title, - description, - uri, - color, - image, - created, - bin_config, - created_by); - - WebResource webResource = this.resource(); - ClientResponse resp = webResource.path("spaces").path(this.firstSpaceUUID).type(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON).entity(spaceJson).put(ClientResponse.class); - - String respStr = resp.getEntity(String.class); - - Assert.assertEquals("Resp status = Bad Request : " + respStr, Status.BAD_REQUEST.getStatusCode(), resp.getStatus()); - Assert.assertEquals("Error message", "Id parameter and id in JSON do not match", respStr); - } - - @Test - public void testPutBadId() { - - String id = UUID.randomUUID().toString(); - String title = "test_post"; - String description = "test space put"; - String uri = "http://ldt.iri.centrepompidou.fr/test_put"; - String color = "#bcbcbc"; - String image = "http://ldt.iri.centrepompidou.fr/test_put/image"; - String created = "2013-01-01T01:01:01.001+0000"; - String bin_config = "{name: 'test_put_config'}"; - String created_by = "test_user_put"; - - String spaceJson = String.format("{" + - "\"id\":\"%s\"," + - "\"title\":\"%s\"," + - "\"description\":\"%s\"," + - "\"uri\":\"%s\"," + - "\"color\":\"%s\"," + - "\"image\":\"%s\"," + - "\"created\":\"%s\"," + - "\"bin_config\":\"%s\"," + - "\"created_by\":\"%s\"" + - "}", - id, - title, - description, - uri, - color, - image, - created, - bin_config, - created_by); - - WebResource webResource = this.resource(); - ClientResponse resp = webResource.path("spaces").path(id).type(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON).entity(spaceJson).put(ClientResponse.class); - - String respStr = resp.getEntity(String.class); - - Assert.assertEquals("Resp status = Bad Request : " + respStr, Status.NOT_FOUND.getStatusCode(), resp.getStatus()); - - } - - @Test - public void testDelete() { + WebTarget WebTarget = this.target(); + Response resp = WebTarget.path("spaces").path(this.firstSpaceUUID) + .request().accept(MediaType.TEXT_PLAIN).delete(); + + String respStr = resp.readEntity(String.class); + URI reqUri = WebTarget.getUriBuilder().path("spaces") + .path(this.firstSpaceUUID).build(); + + Assert.assertEquals("Status must be deleted : " + respStr, + Status.OK.getStatusCode(), resp.getStatus()); + Assert.assertEquals( + String.format("Message must be \"%s deleted\"", reqUri), + String.format("%s deleted", reqUri), respStr); + + // object must be updated + Space sp = this.spacesRepository.findOne(this.firstSpaceUUID); + + Assert.assertNull("Space object must be in rep", sp); + + } + + @Test + public void testSingleGetJsonp() throws JsonProcessingException, + IOException { + WebTarget WebTarget = this.target(); + Response resp = WebTarget.path("spaces").path(this.firstSpaceUUID) + .queryParam("callback", "callback_func").request() + .accept("application/javascript").get(); + Assert.assertEquals("return type must be application/javascript", + "application/javascript", resp.getMediaType().toString()); + + String respStr = resp.readEntity(String.class); + + Assert.assertTrue("resp must start with callback call", + respStr.startsWith("callback_func(")); + Assert.assertTrue("resp must start with callback call", + respStr.endsWith(")")); + + String jsonStr = respStr.substring("callback_func(".length(), + respStr.length() - 1); + ObjectMapper mapper = getObjectMapper(); + JsonNode jsonNode = mapper.readTree(jsonStr); + + Space space = this.spacesList.get(this.firstSpaceUUID); + + String id = jsonNode.get("id").asText(); + Assert.assertEquals("id must be equals", space.getId(), id); + + Assert.assertTrue("the space must have a created", + jsonNode.hasNonNull("created")); + + String dateStr = jsonNode.get("created").asText(); - WebResource webResource = this.resource(); - ClientResponse resp = webResource.path("spaces").path(this.firstSpaceUUID).accept(MediaType.TEXT_PLAIN).delete(ClientResponse.class); - - String respStr = resp.getEntity(String.class); - URI reqUri = webResource.getUriBuilder().path("spaces").path(this.firstSpaceUUID).build(); + DateTimeFormatter fmt = ISODateTimeFormat.dateTime(); + DateTime date = fmt.parseDateTime(dateStr); + + Assert.assertEquals("Created date must be the same", + space.getCreated(), date); + + Assert.assertEquals("title must be the same", space.getTitle(), + jsonNode.get("title").asText()); + + } - Assert.assertEquals("Status must be deleted : " + respStr, Status.OK.getStatusCode(), resp.getStatus()); - Assert.assertEquals(String.format("Message must be \"%s deleted\"", reqUri), String.format("%s deleted",reqUri) , respStr); - - // object must be updated - Space sp = this.spacesRepository.findOne(this.firstSpaceUUID); - - Assert.assertNull("Space object must be in rep", sp); + @Test + public void testSingleGetJsonpAcceptAll() throws JsonProcessingException, + IOException { + WebTarget WebTarget = this.target(); + Response resp = WebTarget.path("spaces").path(this.firstSpaceUUID) + .queryParam("callback", "callback_func").request() + .accept("*/*").get(); + Assert.assertEquals("return type must be application/javascript", + "application/javascript", resp.getMediaType().toString()); - } - - @Test - public void testSingleGetJsonp() throws JsonProcessingException, IOException { - WebResource webResource = this.resource(); - ClientResponse resp = webResource.path("spaces").path(this.firstSpaceUUID).queryParam("callback", "callback_func").accept("application/javascript").get(ClientResponse.class); - Assert.assertEquals("return type must be application/javascript","application/javascript", resp.getType().toString()); + String respStr = resp.readEntity(String.class); - String respStr = resp.getEntity(String.class); - - Assert.assertTrue("resp must start with callback call", respStr.startsWith("callback_func(")); - Assert.assertTrue("resp must start with callback call", respStr.endsWith(")")); - - String jsonStr = respStr.substring("callback_func(".length(), respStr.length()-1); - ObjectMapper mapper = new ObjectMapper(); - JsonNode jsonNode = mapper.readTree(jsonStr); - - Space space = this.spacesList.get(this.firstSpaceUUID); - - String id = jsonNode.get("id").asText(); - Assert.assertEquals("id must be equals", space.getId(), id); - - Assert.assertTrue("the space must have a created", jsonNode.hasNonNull("created")); - - String dateStr = jsonNode.get("created").asText(); - - DateTimeFormatter fmt = ISODateTimeFormat.dateTime(); - DateTime date = fmt.parseDateTime(dateStr); - - Assert.assertEquals("Created date must be the same", space.getCreated(), date.toDate()); - - Assert.assertEquals("title must be the same", space.getTitle(), jsonNode.get("title").asText()); - - } - - @Test - public void testSingleGetJsonpAcceptAll() throws JsonProcessingException, IOException { - WebResource webResource = this.resource(); - ClientResponse resp = webResource.path("spaces").path(this.firstSpaceUUID).queryParam("callback", "callback_func").accept("*/*").get(ClientResponse.class); - Assert.assertEquals("return type must be application/javascript","application/javascript", resp.getType().toString()); + Assert.assertTrue("resp must start with callback call", + respStr.startsWith("callback_func(")); + Assert.assertTrue("resp must start with callback call", + respStr.endsWith(")")); + + String jsonStr = respStr.substring("callback_func(".length(), + respStr.length() - 1); + ObjectMapper mapper = getObjectMapper(); + JsonNode jsonNode = mapper.readTree(jsonStr); + + Space space = this.spacesList.get(this.firstSpaceUUID); + + String id = jsonNode.get("id").asText(); + Assert.assertEquals("id must be equals", space.getId(), id); - String respStr = resp.getEntity(String.class); - - Assert.assertTrue("resp must start with callback call", respStr.startsWith("callback_func(")); - Assert.assertTrue("resp must start with callback call", respStr.endsWith(")")); - - String jsonStr = respStr.substring("callback_func(".length(), respStr.length()-1); - ObjectMapper mapper = new ObjectMapper(); - JsonNode jsonNode = mapper.readTree(jsonStr); - - Space space = this.spacesList.get(this.firstSpaceUUID); - - String id = jsonNode.get("id").asText(); - Assert.assertEquals("id must be equals", space.getId(), id); - - Assert.assertTrue("the space must have a created", jsonNode.hasNonNull("created")); - - String dateStr = jsonNode.get("created").asText(); - - DateTimeFormatter fmt = ISODateTimeFormat.dateTime(); - DateTime date = fmt.parseDateTime(dateStr); - - Assert.assertEquals("Created date must be the same", space.getCreated(), date.toDate()); - - Assert.assertEquals("title must be the same", space.getTitle(), jsonNode.get("title").asText()); - - } + Assert.assertTrue("the space must have a created", + jsonNode.hasNonNull("created")); + + String dateStr = jsonNode.get("created").asText(); + + DateTimeFormatter fmt = ISODateTimeFormat.dateTime(); + DateTime date = fmt.parseDateTime(dateStr); + + Assert.assertEquals("Created date must be the same", + space.getCreated(), date); + + Assert.assertEquals("title must be the same", space.getTitle(), + jsonNode.get("title").asText()); + + } } diff -r 2e738512336a -r 18a43ba77ad0 server/src/test/resources/log4j.xml --- a/server/src/test/resources/log4j.xml Fri Oct 25 16:42:11 2013 +0200 +++ b/server/src/test/resources/log4j.xml Wed Jan 15 18:36:27 2014 +0100 @@ -17,6 +17,9 @@ + + +

diff -r 2e738512336a -r 18a43ba77ad0 server/src/test/resources/org/iri_research/renkan/test/controller/controller-context.xml --- a/server/src/test/resources/org/iri_research/renkan/test/controller/controller-context.xml Fri Oct 25 16:42:11 2013 +0200 +++ b/server/src/test/resources/org/iri_research/renkan/test/controller/controller-context.xml Wed Jan 15 18:36:27 2014 +0100 @@ -13,6 +13,10 @@ + + + +

Renkan administration

Groups List / Delete group

Renkan administration

Groups List / Edit group

Renkan administration

List of objects

Spaces List / Delete space

Renkan administration

List of objects

List of objects

Renkan administration

Users List / Delete user

Renkan administration

Users List / Edit user

Renkan administration

List of objects