minor test changes

This commit is contained in:
eugenp 2015-04-05 11:36:29 +03:00
parent 2fbe17c967
commit f944af11a5

View File

@ -16,7 +16,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.AnnotationConfigContextLoader; import org.springframework.test.context.support.AnnotationConfigContextLoader;
@ -28,8 +27,10 @@ import com.jayway.restassured.specification.RequestSpecification;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = { ConfigTest.class, PersistenceJPAConfig.class }, loader = AnnotationConfigContextLoader.class) @ContextConfiguration(classes = { ConfigTest.class, PersistenceJPAConfig.class }, loader = AnnotationConfigContextLoader.class)
@ActiveProfiles("test") public class ChangePasswordApiTest {
public class RegistrationAPIChangePasswordTest {
private final String URL_PREFIX = "http://localhost:8080/spring-security-login-and-registration";
private final String URL = URL_PREFIX + "/user/updatePassword";
@Autowired @Autowired
private UserRepository userRepository; private UserRepository userRepository;
@ -37,11 +38,7 @@ public class RegistrationAPIChangePasswordTest {
@Autowired @Autowired
private PasswordEncoder passwordEncoder; private PasswordEncoder passwordEncoder;
private final String URL_PREFIX = "http://localhost:8080/spring-security-login-and-registration"; private final FormAuthConfig formConfig = new FormAuthConfig(URL_PREFIX + "/j_spring_security_check", "j_username", "j_password");
private final String URL = URL_PREFIX + "/user/updatePassword";
FormAuthConfig formConfig = new FormAuthConfig(URL_PREFIX + "/j_spring_security_check", "j_username", "j_password");
@Before @Before
public void init() { public void init() {
@ -60,6 +57,8 @@ public class RegistrationAPIChangePasswordTest {
} }
} }
// test
@Test @Test
public void givenLoggedInUser_whenChangingPassword_thenCorrect() { public void givenLoggedInUser_whenChangingPassword_thenCorrect() {
final RequestSpecification request = RestAssured.given().auth().form("test@test.com", "test", formConfig); final RequestSpecification request = RestAssured.given().auth().form("test@test.com", "test", formConfig);
@ -99,4 +98,5 @@ public class RegistrationAPIChangePasswordTest {
assertEquals(302, response.statusCode()); assertEquals(302, response.statusCode());
assertFalse(response.body().asString().contains("Password updated successfully")); assertFalse(response.body().asString().contains("Password updated successfully"));
} }
} }