Skip to content
Snippets Groups Projects
Commit ab487647 authored by Sigrid Ertresvåg Jakobsen's avatar Sigrid Ertresvåg Jakobsen
Browse files
parents 22992ca7 68d636b7
No related branches found
No related tags found
No related merge requests found
Pipeline #72201 passed
...@@ -278,4 +278,5 @@ public class UserDAO { ...@@ -278,4 +278,5 @@ public class UserDAO {
} }
return false; return false;
} }
} }
...@@ -56,5 +56,13 @@ public class UserResource { ...@@ -56,5 +56,13 @@ public class UserResource {
UserDAO userDAO = new UserDAO(); UserDAO userDAO = new UserDAO();
return userDAO.addUser(user); return userDAO.addUser(user);
} }
@Path("/{userId}")
@PUT
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public boolean editUser(@PathParam("userId")int userId, User user){
UserDAO userDAO = new UserDAO();
return userDAO.editUser(userId,user.getUsername(),user.getPassword());
}
} }
...@@ -44,5 +44,4 @@ function loadApplication(user){ ...@@ -44,5 +44,4 @@ function loadApplication(user){
sessionStorage.setItem("username", user.username); sessionStorage.setItem("username", user.username);
sessionStorage.setItem("password", user.password); sessionStorage.setItem("password", user.password);
window.location.href = "../app.html" window.location.href = "../app.html"
} }
...@@ -3,6 +3,7 @@ import data.User; ...@@ -3,6 +3,7 @@ import data.User;
import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest; import org.glassfish.jersey.test.JerseyTest;
import org.glassfish.jersey.test.TestProperties; import org.glassfish.jersey.test.TestProperties;
import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import resources.UserResource; import resources.UserResource;
...@@ -42,14 +43,16 @@ public class UserResourceTest extends JerseyTest { ...@@ -42,14 +43,16 @@ public class UserResourceTest extends JerseyTest {
assertEquals("application/json",output.getHeaderString("Content-type")); assertEquals("application/json",output.getHeaderString("Content-type"));
} }
/*
@Test @Test
public void testEditUser () { public void testEditUser () {
user2.setUserId(10); user2.setUserId(10);
user2.setUsername("test"); user2.setUsername("test");
Response output = target("user/"+2).request().put(Entity.entity(user2, MediaType.APPLICATION_JSON)); Response output = target("user/"+10).request().put(Entity.entity(user2, MediaType.APPLICATION_JSON));
System.out.println(output.getStatus());
assertEquals("Should return status 200", 200, output.getStatus()); assertEquals("Should return status 200", 200, output.getStatus());
assertEquals("application/json",output.getHeaderString("Content-type")); assertEquals("application/json",output.getHeaderString("Content-type"));
assertNotEquals("testUsername",user2.getUsername()); assertNotEquals("testUsername",user2.getUsername());
}*/ }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment