Skip to content

Commit

Permalink
Rename tests prior to feature implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
fhanik committed Apr 20, 2015
1 parent e42ffb5 commit cdf511f
Showing 1 changed file with 10 additions and 10 deletions.
Expand Up @@ -21,8 +21,8 @@
import org.cloudfoundry.identity.uaa.scim.ScimUser;
import org.cloudfoundry.identity.uaa.scim.ScimUserProvisioning;
import org.cloudfoundry.identity.uaa.test.YamlServletProfileInitializerContextInitializer;
import org.junit.After;
import org.junit.Before;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContext;
Expand All @@ -46,15 +46,15 @@
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;

public class ResetPasswordControllerIntegrationTests extends TestClassNullifier {
public class ResetPasswordControllerMockMvcTests extends TestClassNullifier {

XmlWebApplicationContext webApplicationContext;
static XmlWebApplicationContext webApplicationContext;

private MockMvc mockMvc;
private ExpiringCodeStore codeStore;
private static MockMvc mockMvc;
private static ExpiringCodeStore codeStore;

@Before
public void setUp() throws Exception {
@BeforeClass
public static void initResetPasswordTest() throws Exception {
webApplicationContext = new XmlWebApplicationContext();
new YamlServletProfileInitializerContextInitializer().initializeContext(webApplicationContext, "login.yml,uaa.yml");
webApplicationContext.setConfigLocation("file:./src/main/webapp/WEB-INF/spring-servlet.xml");
Expand All @@ -67,8 +67,8 @@ public void setUp() throws Exception {
codeStore = webApplicationContext.getBean(ExpiringCodeStore.class);
}

@After
public void cleanUpAfterPasswordReset() throws Exception {
@AfterClass
public static void cleanUpAfterPasswordReset() throws Exception {
Flyway flyway = webApplicationContext.getBean(Flyway.class);
flyway.clean();
webApplicationContext.destroy();
Expand Down

0 comments on commit cdf511f

Please sign in to comment.