From cdf511ff9d3cbbaf31e7d16325ad641e62111768 Mon Sep 17 00:00:00 2001
From: Filip Hanik <fhanik@pivotal.io>
Date: Mon, 20 Apr 2015 09:39:42 -0600
Subject: [PATCH] Rename tests prior to feature implementation

---
 ... ResetPasswordControllerMockMvcTests.java} | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
 rename uaa/src/test/java/org/cloudfoundry/identity/uaa/login/{ResetPasswordControllerIntegrationTests.java => ResetPasswordControllerMockMvcTests.java} (91%)

diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/ResetPasswordControllerIntegrationTests.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/ResetPasswordControllerMockMvcTests.java
similarity index 91%
rename from uaa/src/test/java/org/cloudfoundry/identity/uaa/login/ResetPasswordControllerIntegrationTests.java
rename to uaa/src/test/java/org/cloudfoundry/identity/uaa/login/ResetPasswordControllerMockMvcTests.java
index 360d2ad6e77..a9be6dcab1f 100644
--- a/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/ResetPasswordControllerIntegrationTests.java
+++ b/uaa/src/test/java/org/cloudfoundry/identity/uaa/login/ResetPasswordControllerMockMvcTests.java
@@ -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;
@@ -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");
@@ -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();