Fixed test cases

Author: naturalprogrammer

lemon-demo-jpa/src/test/java/com/naturalprogrammer/spring/lemondemo/AbstractMvcTests.java

@@ -64,7 +64,7 @@ public abstract class AbstractMvcTests {
 
     protected String login(String userName, String password) throws Exception {
 
-        MvcResult result = mvc.perform(post("/login")
+        MvcResult result = mvc.perform(post("/api/core/login")
                 .param("username", userName)
                 .param("password", password)
                 .header("contentType",  MediaType.APPLICATION_FORM_URLENCODED))

lemon-demo-jpa/src/test/java/com/naturalprogrammer/spring/lemondemo/LoginMvcTests.java

@@ -22,7 +22,7 @@ public class LoginMvcTests extends AbstractMvcTests {
 	@Test
 	public void testLogin() throws Exception {
 
-		mvc.perform(post("/login")
+		mvc.perform(post("/api/core/login")
                 .param("username", ADMIN_EMAIL)
                 .param("password", ADMIN_PASSWORD)
                 .header("contentType",  MediaType.APPLICATION_FORM_URLENCODED))
@@ -82,7 +82,7 @@ public void testObsoleteToken() throws Exception {
 	@Test
 	public void testLoginWrongPassword() throws Exception {
 
-		mvc.perform(post("/login")
+		mvc.perform(post("/api/core/login")
                 .param("username", ADMIN_EMAIL)
                 .param("password", "wrong-password")
                 .header("contentType",  MediaType.APPLICATION_FORM_URLENCODED))
@@ -92,7 +92,7 @@ public void testLoginWrongPassword() throws Exception {
 	@Test
 	public void testLoginBlankPassword() throws Exception {
 
-		mvc.perform(post("/login")
+		mvc.perform(post("/api/core/login")
                 .param("username", ADMIN_EMAIL)
                 .param("password", "")
                 .header("contentType",  MediaType.APPLICATION_FORM_URLENCODED))
@@ -125,7 +125,7 @@ public void testLogout() throws Exception {
 
 	private String login(String username, String password, long expirationMillis) throws Exception {
 
-		MvcResult result = mvc.perform(post("/login")
+		MvcResult result = mvc.perform(post("/api/core/login")
                 .param("username", ADMIN_EMAIL)
                 .param("password", ADMIN_PASSWORD)
                 .param("expirationMillis", Long.toString(expirationMillis))

lemon-demo-jpa/src/test/java/com/naturalprogrammer/spring/lemondemo/ResetPasswordMvcTests.java

@@ -11,8 +11,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.naturalprogrammer.spring.lemon.commons.domain.ResetPasswordForm;
 import com.naturalprogrammer.spring.lemon.commons.security.JwtService;
 import com.naturalprogrammer.spring.lemon.commons.util.LecUtils;
+import com.naturalprogrammer.spring.lemon.util.LemonUtils;
 
 public class ResetPasswordMvcTests extends AbstractMvcTests {
 
@@ -37,9 +40,8 @@ public void testResetPassword() throws Exception {
 		//Thread.sleep(1001L);
 
 		mvc.perform(post("/api/core/reset-password")
-                .param("code", forgotPasswordCode)
-                .param("newPassword", NEW_PASSWORD)
-                .header("contentType",  MediaType.APPLICATION_FORM_URLENCODED))
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(form(forgotPasswordCode, NEW_PASSWORD)))
 		        .andExpect(status().is(200))
 				.andExpect(header().string(LecUtils.TOKEN_RESPONSE_HEADER_NAME, containsString(".")))
 				.andExpect(jsonPath("$.id").value(ADMIN_ID));
@@ -49,9 +51,8 @@ public void testResetPassword() throws Exception {
 
 	    // Repeating shouldn't work
 		mvc.perform(post("/api/core/reset-password")
-                .param("code", forgotPasswordCode)
-                .param("newPassword", NEW_PASSWORD)
-                .header("contentType",  MediaType.APPLICATION_FORM_URLENCODED))
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(form(forgotPasswordCode, NEW_PASSWORD)))
 		        .andExpect(status().is(401));
 	}
 
@@ -60,23 +61,29 @@ public void testResetPasswordInvalidData() throws Exception {
 
 		// Wrong code
 		mvc.perform(post("/api/core/reset-password")
-                .param("code", "wrong-code")
-                .param("newPassword", "abc99!")
-                .header("contentType",  MediaType.APPLICATION_FORM_URLENCODED))
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(form("wrong-code", "abc99!")))
 		        .andExpect(status().is(401));
 
 		// Blank password
 		mvc.perform(post("/api/core/reset-password")
-                .param("code", forgotPasswordCode)
-                .param("newPassword", "")
-                .header("contentType",  MediaType.APPLICATION_FORM_URLENCODED))
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(form(forgotPasswordCode, "")))
 		        .andExpect(status().is(422));
 
 		// Invalid password
 		mvc.perform(post("/api/core/reset-password")
-                .param("code", forgotPasswordCode)
-                .param("newPassword", "abc")
-                .header("contentType",  MediaType.APPLICATION_FORM_URLENCODED))
+				.contentType(MediaType.APPLICATION_JSON)
+				.content(form(forgotPasswordCode, "abc")))
 		        .andExpect(status().is(422));
 	}
+	
+	private String form(String code, String newPassword) throws JsonProcessingException {
+		
+		ResetPasswordForm form = new ResetPasswordForm();
+		form.setCode(code);
+		form.setNewPassword(newPassword);
+		
+		return LemonUtils.toJson(form);
+	}
 }