Commit @85ca03e511afe3d788aced7571860668dc57d605

Suwon Chae 2014-08-04

test: refactoring which is aimed for testing time and efficiency

@85ca03e511afe3d788aced7571860668dc57d605

0431e4c

85ca03e

app/models/PullRequest.java

--- app/models/PullRequest.java

+++ app/models/PullRequest.java

...	...	@@ -935,4 +935,9 @@
935	935	this.mergedCommitIdFrom != null && this.mergedCommitIdTo != null;
936	936	}
937	937
	938	+ @Override
	939	+ public Object clone() throws CloneNotSupportedException {
	940	+ PullRequest cloned = (PullRequest)super.clone();
	941	+ return cloned;
	942	+ }
938	943	}

0431e4c

85ca03e

app/utils/PasswordReset.java

--- app/utils/PasswordReset.java

+++ app/utils/PasswordReset.java


     }
 
     public static void addHashToResetTable(String userId, String hashString) {
-        Logger.debug(">> add to HashTable " + userId + ":" + hashString);
         PasswordReset.resetHashMap.put(userId, hashString);
         resetHashTimetable.put(hashString, new DateTime().getMillis());
     }
 
     public static boolean isValidResetHash(String hashString) {
-        Logger.debug("Reset hash entry size:" + resetHashMap.size());
         if( !resetHashMap.containsValue(hashString) ) {
-            Logger.debug("HashString doesn't exists in resetHashMap: " + hashString);
             return false;
         }
 
         if(isExpired(hashString)) {
-            Logger.debug("HashString was expired: " + hashString);
             return false;
         }
 

0431e4c

85ca03e

conf/test-data.yml

--- conf/test-data.yml

+++ conf/test-data.yml


         state:          ACTIVE
         email:          doortts@gmail.com
         createdDate:           2012-07-01 08:00:00
+        state: ACTIVE
     - !!models.User
         name:           eungjun
         loginId:        nori

0431e4c

85ca03e

project/Build.scala

--- project/Build.scala

+++ project/Build.scala


 import sbt._
-import Keys._
+import sbt.Keys._
 import play.Project.javaCore
 import play.Project.javaJdbc
 import play.Project.javaEbean

       templatesImport += "models.enumeration._",
       lessEntryPoints <<= baseDirectory(_ / "app" / "assets" / "stylesheets" ** "yobi.less"),
         //      jacoco.settings:_*,
-      javaOptions in test ++= Seq("-Xmx512m", "-XX:MaxPermSize=512m", "-Dfile.encoding=UTF-8"),
+      javaOptions in test ++= Seq("-Xmx2g", "-Xms1g", "-XX:MaxPermSize=1g", "-Dfile.encoding=UTF-8"),
       javacOptions ++= Seq("-Xlint:all", "-Xlint:-path"),
       scalacOptions ++= Seq("-feature")
     )

0431e4c

85ca03e

test/controllers/CommentAppTest.java

--- test/controllers/CommentAppTest.java

+++ test/controllers/CommentAppTest.java


         callAction(
                 routes.ref.Application.init()
         );
+        app = support.Helpers.makeTestApplication();
+        Helpers.start(app);
     }
 
     @Before
     public void before() {
-        app = support.Helpers.makeTestApplication();
-        Helpers.start(app);
-
         admin = User.findByLoginId("admin");
         manager = User.findByLoginId("yobi");
         member = User.findByLoginId("laziel");

0431e4c

85ca03e

test/controllers/EnrollProjectAppTest.java

--- test/controllers/EnrollProjectAppTest.java

+++ test/controllers/EnrollProjectAppTest.java


 import play.test.FakeApplication;
 
 public class EnrollProjectAppTest {
-    private FakeApplication application;
+    private static FakeApplication application;
 
-    @Before
-    public void before() {
+    @BeforeClass
+    public static void beforeClass() {
         application = support.Helpers.makeTestApplication();
         start(application);
     }
 
-    @After
-    public void after() {
+    @AfterClass
+    public static void afterClass() {
         stop(application);
     }
 

0431e4c

85ca03e

test/controllers/ImportAppTest.java

--- test/controllers/ImportAppTest.java

+++ test/controllers/ImportAppTest.java


 import models.Project;
 import models.User;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 
 import controllers.routes.ref;
 

 import utils.Constants;
 
 public class ImportAppTest {
-    private FakeApplication application;
-    private User yobi;
-    private Project src;
-    private Project dest;
-    private Map<String, String> formData;
+    private static FakeApplication application;
+    private static User yobi;
+    private static Project src;
+    private static Project dest;
+    private static Map<String, String> formData;
 
-    @Before
-    public void before() throws Exception {
+    @BeforeClass
+    public static void before() throws Exception {
         GitRepository.setRepoPrefix("resources/test/repo/git/");
         GitRepository.setRepoForMergingPrefix("resources/test/repo/git-merging/");
         application = support.Helpers.makeTestApplication();

         formData = new HashMap<>();
     }
 
-    @After
-    public void after() {
+    @AfterClass
+    public static void after() {
         stop(application);
         support.Files.rm_rf(new File(GitRepository.getRepoPrefix()));
         support.Files.rm_rf(new File(GitRepository.getRepoForMergingPrefix()));

         assertThat(contentAsString(result)).contains(Messages.get(Lang.defaultLang(), "project.name.alert"));
     }
 
-    private Project project(String owner, String name) {
+    private static Project project(String owner, String name) {
         Project project = new Project();
         project.owner = owner;
         project.name = name;
         return project;
     }
 
-    private void createRepository(Project project) throws Exception {
+    private static void createRepository(Project project) throws Exception {
         GitRepository gitRepository = new GitRepository(project);
         gitRepository.create();
         gitRepository.close();

0431e4c

85ca03e

test/controllers/ProjectAppTest.java

--- test/controllers/ProjectAppTest.java

+++ test/controllers/ProjectAppTest.java


         Helpers.start(app);
     }
 
-    @After
-    public void after() {
-        Helpers.stop(app);
-    }
-
     @Test
     public void label() {
         //Given

0431e4c

85ca03e

test/controllers/PullRequestAppTest.java

--- test/controllers/PullRequestAppTest.java

+++ test/controllers/PullRequestAppTest.java


 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.transport.RefSpec;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 
+import org.junit.rules.TestWatcher;
 import play.mvc.Result;
 import play.test.FakeApplication;
 import play.test.Helpers;
+import support.ExecutionTimeWatcher;
 import playRepository.GitRepository;
 
 public class PullRequestAppTest {
-    protected FakeApplication app;
+    protected static FakeApplication app;
 
     private String ownerLoginId;
     private String projectName;
     private Long pullRequestNumber;
+    private static PullRequest pullRequest;
+    private static boolean isInit = false;
+
+    @Rule
+    public TestWatcher watcher = new ExecutionTimeWatcher();
+
+    @BeforeClass
+    public static void beforeClass() {
+        callAction(
+                routes.ref.Application.init()
+        );
+        app = support.Helpers.makeTestApplication();
+        Helpers.start(app);
+    }
+
+    @Before
+    public void before() {
+        GitRepository.setRepoPrefix("resources/test/repo/git/");
+        GitRepository.setRepoForMergingPrefix("resources/test/repo/git-merging/");
+    }
+
+    @AfterClass
+    public static void afterClase(){
+        Helpers.stop(app);
+    }
+
+    @After
+    public void after() {
+        support.Files.rm_rf(new File(GitRepository.getRepoPrefix()));
+        support.Files.rm_rf(new File(GitRepository.getRepoForMergingPrefix()));
+    }
 
     @Test
     public void testCloseAnonymous() throws Exception {

         Result result = callAction(
                 controllers.routes.ref.PullRequestApp.close(ownerLoginId, projectName, pullRequestNumber),
                 fakeRequest("GET", "/" + ownerLoginId + "/" + projectName + "/pullRequest/" + pullRequestNumber)
-                .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
-              );
+                        .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
+        );
 
         assertThat(status(result)).isEqualTo(SEE_OTHER);
         assertThat(PullRequest.findById(pullRequestNumber).state).isEqualTo(State.CLOSED);

     public void testClosePullRequestNotAllow() throws Exception {
         initParameters("yobi", "projectYobi", 1L);
         User currentUser = User.findByLoginId("alecsiel");
+        User projectOwner = User.findByLoginId("yobi");
+
+        callAction(
+                controllers.routes.ref.PullRequestApp.open(ownerLoginId, projectName, pullRequestNumber),
+                fakeRequest("GET", "/" + ownerLoginId + "/" + projectName + "/pullRequest/" + pullRequestNumber)
+                        .withSession(UserApp.SESSION_USERID, projectOwner.id.toString())
+        );
 
         Result result = callAction(
                 controllers.routes.ref.PullRequestApp.close(ownerLoginId, projectName, pullRequestNumber),

         Result result = callAction(
                 controllers.routes.ref.PullRequestApp.newFork(ownerLoginId, projectName, null),
                 fakeRequest("GET", "/" + ownerLoginId + "/" + projectName + "/newFork")
-                .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
-              );
+                        .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
+        );
 
         assertThat(status(result)).isEqualTo(OK);
     }

         Result result = callAction(
                 controllers.routes.ref.PullRequestApp.newFork(ownerLoginId, projectName, null),
                 fakeRequest("GET", "/" + ownerLoginId + "/" + projectName + "/newFork")
-                .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
-              );
+                        .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
+        );
 
         assertThat(status(result)).isEqualTo(FORBIDDEN);
     }

         Result result = callAction(
                 controllers.routes.ref.PullRequestApp.fork(ownerLoginId, projectName),
                 fakeRequest("GET", "/" + ownerLoginId + "/" + projectName + "/fork")
-                .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
-                .withFormUrlEncodedBody(data)
-              );
+                        .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
+                        .withFormUrlEncodedBody(data)
+        );
 
         assertThat(status(result)).isEqualTo(OK);
     }

 
     @Test
     public void testOpenRoute() throws Exception {
+        //Given
         initParameters("yobi", "projectYobi", 1L);
-        String url = "/" + ownerLoginId + "/" + projectName + "/pullRequest/" + pullRequestNumber + "/open";
         User currentUser = User.findByLoginId("yobi");
+        User projectOwner = User.findByLoginId("yobi");
 
+        String url = "/" + ownerLoginId + "/" + projectName + "/pullRequest/" + pullRequestNumber + "/open";
+        callAction(
+                controllers.routes.ref.PullRequestApp.open(ownerLoginId, projectName, pullRequestNumber),
+                fakeRequest("GET", "/" + ownerLoginId + "/" + projectName + "/pullRequest/" + pullRequestNumber)
+                        .withSession(UserApp.SESSION_USERID, projectOwner.id.toString())
+        );
+
+        //When
         Result result = route(
             fakeRequest(POST, url).withSession(UserApp.SESSION_USERID, currentUser.id.toString())
         );
+
+        //Then
         assertThat(status(result)).isEqualTo(BAD_REQUEST);
 
         Project project = Project.findByOwnerAndProjectName(ownerLoginId, projectName);
         PullRequest pullRequest = PullRequest.findOne(project, pullRequestNumber);
 
         assertThat(pullRequest.state).isEqualTo(State.OPEN);
-    }
-
-    @BeforeClass
-    public static void beforeClass() {
-        callAction(
-                routes.ref.Application.init()
-        );
-    }
-
-    @Before
-    public void before() {
-        GitRepository.setRepoPrefix("resources/test/repo/git/");
-        GitRepository.setRepoForMergingPrefix("resources/test/repo/git-merging/");
-        app = support.Helpers.makeTestApplication();
-        Helpers.start(app);
-    }
-
-    @After
-    public void after() {
-        Helpers.stop(app);
-        support.Files.rm_rf(new File(GitRepository.getRepoPrefix()));
-        support.Files.rm_rf(new File(GitRepository.getRepoForMergingPrefix()));
     }
 
     private void initParameters(String ownerLoginId, String projectName, Long pullRequestNumber)

0431e4c

85ca03e

test/controllers/ReviewThreadAppTest.java

--- test/controllers/ReviewThreadAppTest.java

+++ test/controllers/ReviewThreadAppTest.java


     protected static FakeApplication app;
 
     /**
+     * 테스트를 위해 메모리 DB로 전환
+     */
+    @BeforeClass
+    public static void beforeClass() {
+        app = support.Helpers.makeTestApplication();
+        Helpers.start(app);
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        Helpers.stop(app);
+    }
+
+    /**
      * 잘못된 URL을 입력하여 not found return을 테스트
      */
     @Test

         );
 
         assertThat(status(result)).isEqualTo(SEE_OTHER);
-    }
-
-    /**
-     * 테스트를 위해 메모리 DB로 전환
-     */
-    @BeforeClass
-    public static void beforeClass() {
-        app = support.Helpers.makeTestApplication();
-        Helpers.start(app);
-    }
-
-    @AfterClass
-    public static void afterClass() {
-        Helpers.stop(app);
     }
 }

0431e4c

test/controllers/SearchAppTest.java (deleted)

--- test/controllers/SearchAppTest.java

...	...	@@ -1,35 +0,0 @@
	1	-/**
	2	- * Yobi, Project Hosting SW
	3	- *
	4	- * Copyright 2012 NAVER Corp.
	5	- * http://yobi.io
	6	- *
	7	- * @Author Suwon Chae
	8	- *
	9	- * Licensed under the Apache License, Version 2.0 (the "License");
	10	- * you may not use this file except in compliance with the License.
	11	- * You may obtain a copy of the License at
	12	- *
	13	- * http://www.apache.org/licenses/LICENSE-2.0
	14	- *
	15	- * Unless required by applicable law or agreed to in writing, software
	16	- * distributed under the License is distributed on an "AS IS" BASIS,
	17	- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	18	- * See the License for the specific language governing permissions and
	19	- * limitations under the License.
	20	- */
	21	-package controllers;
	22	-
	23	-import org.junit.Ignore;
	24	-import org.junit.Test;
	25	-
	26	-public class SearchAppTest {
	27	- @Test
	28	- @Ignore
	29	- public void testContentsSearch_fromTitle() {
	30	- }
	31	-
	32	- @Test @Ignore
	33	- public void findById() {
	34	- }
	35	-}

0431e4c

85ca03e

test/controllers/SiteAppTest.java

--- test/controllers/SiteAppTest.java

+++ test/controllers/SiteAppTest.java


 import models.*;
 import models.enumeration.UserState;
 import org.junit.*;
+import play.mvc.Result;
 import play.test.FakeApplication;
 import play.test.Helpers;
 

 import java.util.Map;
 
 import static org.fest.assertions.Assertions.assertThat;
-import static play.test.Helpers.callAction;
-import static play.test.Helpers.fakeRequest;
+import static play.test.Helpers.*;
 
 public class SiteAppTest {
     protected static FakeApplication app;
-    private User admin;
-    private User notAdmin;
 
     @BeforeClass
     public static void beforeClass() {
         callAction(
                 routes.ref.Application.init()
         );
-    }
-
-    @Before
-    public void before() {
-        Map<String, String> config = support.Helpers.makeTestConfig();
-        config.put("signup.require.confirm", "true");
-        app = support.Helpers.makeTestApplication(config);
+        app = support.Helpers.makeTestApplication();
         Helpers.start(app);
     }
 
-    @After
-    public void after() {
+    @AfterClass
+    public static void afterClass() {
         Helpers.stop(app);
     }
 
-    @Test @Ignore   //FixMe I don't know how to make a assert
+
+    @Test
     public void testToggleUserAccountLock() {
         //Given
         Map<String,String> data = new HashMap<>();
         final String loginId= "doortts";
         data.put("loginId", loginId);
+        User admin = User.find.byId(1L);
 
-        User targetUser = User.findByLoginId(loginId);
-        UserState currentIsLocked = targetUser.state;
-
+        System.out.println(User.findByLoginId(loginId).state);
         //When
-        callAction(
+
+        Result result = callAction(
                 controllers.routes.ref.SiteApp.toggleAccountLock(loginId, "", ""),
-                fakeRequest()
+                fakeRequest(POST, routes.SiteApp.toggleAccountLock(loginId, "", "").url())
                         .withFormUrlEncodedBody(data)
-                        .withSession("loginId", "admin")
-        );
+                        .withSession("loginId", admin.loginId)
+                        .withSession(UserApp.SESSION_USERID, admin.id.toString()));
         //Then
-        assertThat(User.findByLoginId(loginId).state).isNotEqualTo(currentIsLocked);
+        assertThat(status(result)).isEqualTo(OK);
+        assertThat(flash(result)).isEmpty();
+        assertThat(User.findByLoginId(loginId).state).isEqualTo(UserState.LOCKED);
     }
 }

0431e4c

85ca03e

test/controllers/UserAppTest.java

--- test/controllers/UserAppTest.java

+++ test/controllers/UserAppTest.java


 
 import java.util.*;
 
+import org.junit.rules.TestWatcher;
 import play.mvc.*;
 import play.mvc.Http.*;
+import play.test.FakeApplication;
+import play.test.Helpers;
+import support.ExecutionTimeWatcher;
 import support.ContextTest;
 import utils.JodaDateUtil;
 

 import static org.mockito.Mockito.*;
 
 public class UserAppTest extends ContextTest {
+    protected static FakeApplication app;
+
+    @Rule
+    public TestWatcher watcher = new ExecutionTimeWatcher();
+
     @BeforeClass
     public static void beforeClass() {
         callAction(
                 routes.ref.Application.init()
         );
+        Map<String, String> config = support.Helpers.makeTestConfig();
+        config.put("signup.require.confirm", "true");
+
+        app = support.Helpers.makeTestApplication(config);
+        Helpers.start(app);
+    }
+
+    @AfterClass
+    public static void afterClass() {
+        Helpers.stop(app);
     }
 
     @Test
     public void findById_doesntExist() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                //Given
-                Map<String,String> data = new HashMap<>();
-                data.put("loginId", "nekure");
+        //Given
+        Map<String,String> data = new HashMap<>();
+        data.put("loginId", "nekure");
 
-                //When
-                Result result = callAction(
-                        controllers.routes.ref.UserApp.isUsed("nekure"),
-                        fakeRequest().withFormUrlEncodedBody(data)
-                );  // fakeRequest doesn't need here, but remains for example
+        //When
+        Result result = callAction(
+                controllers.routes.ref.UserApp.isUsed("nekure"),
+                fakeRequest().withFormUrlEncodedBody(data)
+        );  // fakeRequest doesn't need here, but remains for example
 
-                //Then
-                assertThat(status(result)).isEqualTo(OK);
-                assertThat(contentAsString(result)).contains("\"isExist\":false");
-                assertThat(contentType(result)).contains("json");
-            }
-        });
+        //Then
+        assertThat(status(result)).isEqualTo(OK);
+        assertThat(contentAsString(result)).contains("\"isExist\":false");
+        assertThat(contentType(result)).contains("json");
     }
 
     @Test
     public void findById_alreadyExist() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                //Given
-                Map<String,String> data = new HashMap<>();
-                data.put("loginId", "yobi");
+        //Given
+        Map<String,String> data = new HashMap<>();
+        data.put("loginId", "yobi");
 
-                //When
-                Result result = callAction(
-                        controllers.routes.ref.UserApp.isUsed("yobi"),
-                        fakeRequest().withFormUrlEncodedBody(data)
-                ); // fakeRequest doesn't need here, but remains for example
+        //When
+        Result result = callAction(
+                controllers.routes.ref.UserApp.isUsed("yobi"),
+                fakeRequest().withFormUrlEncodedBody(data)
+        ); // fakeRequest doesn't need here, but remains for example
 
-                //Then
-                assertThat(status(result)).isEqualTo(OK);
-                assertThat(contentAsString(result)).contains("\"isExist\":true");
-                assertThat(contentType(result)).contains("json");
-            }
-        });
+        //Then
+        assertThat(status(result)).isEqualTo(OK);
+        assertThat(contentAsString(result)).contains("\"isExist\":true");
+        assertThat(contentType(result)).contains("json");
     }
 
     @Test
     public void findById_alreadyExistGroupName() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                //Given
-                String loginId = "labs";
+        //Given
+        String loginId = "labs";
 
-                //When
-                Result result = callAction(controllers.routes.ref.UserApp.isUsed(loginId));
+        //When
+        Result result = callAction(controllers.routes.ref.UserApp.isUsed(loginId));
 
-                //Then
-                assertThat(status(result)).isEqualTo(OK);
-                assertThat(contentAsString(result)).contains("\"isExist\":true");
-                assertThat(contentType(result)).contains("json");
-            }
-        });
+        //Then
+        assertThat(status(result)).isEqualTo(OK);
+        assertThat(contentAsString(result)).contains("\"isExist\":true");
+        assertThat(contentType(result)).contains("json");
     }
 
     @Test
     public void isEmailExist() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                //Given
-                //When
-                Result result = callAction(
-                        controllers.routes.ref.UserApp.isEmailExist("doortts@gmail.com")
-                );
+        //Given
+        //When
+        Result result = callAction(
+                controllers.routes.ref.UserApp.isEmailExist("doortts@gmail.com")
+        );
 
-                //Then
-                assertThat(status(result)).isEqualTo(OK);
-                assertThat(contentAsString(result)).contains("{\"isExist\":true}");
-            }
-        });
+        //Then
+        assertThat(status(result)).isEqualTo(OK);
+        assertThat(contentAsString(result)).contains("{\"isExist\":true}");
     }
 
     @Test
     public void login_notComfirmedUser() {
-        Map<String, String> config = support.Helpers.makeTestConfig();
-        config.put("signup.require.confirm", "true");
+        //Given
+        User user = new User(-31l);
+        user.loginId = "fakeUser";
+        user.email = "fakeuser@fake.com";
+        user.name = "racoon";
+        user.password = "somefakepassword";
+        user.createdDate = JodaDateUtil.now();
+        user.state = UserState.LOCKED;
+        user.save();
 
-        running(support.Helpers.makeTestApplication(config), new Runnable() {
-            @Override
-            public void run() {
-                //Given
-                User user = new User(-31l);
-                user.loginId = "fakeUser";
-                user.email = "fakeuser@fake.com";
-                user.name = "racoon";
-                user.password = "somefakepassword";
-                user.createdDate = JodaDateUtil.now();
-                user.state = UserState.LOCKED;
-                user.save();
+        Map<String, String> data = new HashMap<>();
+        data.put("loginIdOrEmail", user.loginId);
+        data.put("password", user.password);
 
-                Map<String, String> data = new HashMap<>();
-                data.put("loginIdOrEmail", user.loginId);
-                data.put("password", user.password);
+        //When
+        Result result = callAction(
+                controllers.routes.ref.UserApp.login(),
+                fakeRequest().withFormUrlEncodedBody(data)
+        );
 
-                //When
-                Result result = callAction(
-                        controllers.routes.ref.UserApp.login(),
-                        fakeRequest().withFormUrlEncodedBody(data)
-                );
-
-                //Then
-                assertThat(status(result)).describedAs("result status should '303 see other'").isEqualTo(303);
-            }
-        });
+        //Then
+        assertThat(status(result)).describedAs("result status should '303 see other'").isEqualTo(303);
     }
 
     @Test
     public void newUser_AlreadyExistGroupName() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                //Given
-                Map<String, String> data = new HashMap<>();
-                data.put("loginId", "labs");
-                data.put("password", "somefakepassword");
-                data.put("email", "labs@fake.com");
-                data.put("name", "labs");
+        //Given
+        Map<String, String> data = new HashMap<>();
+        data.put("loginId", "labs");
+        data.put("password", "somefakepassword");
+        data.put("email", "labs@fake.com");
+        data.put("name", "labs");
 
-                //When
-                Result result = callAction(
-                        controllers.routes.ref.UserApp.newUser(),
-                        fakeRequest().withFormUrlEncodedBody(data)
-                );
+        //When
+        Result result = callAction(
+                controllers.routes.ref.UserApp.newUser(),
+                fakeRequest().withFormUrlEncodedBody(data)
+        );
 
-                //Then
-                assertThat(status(result)).describedAs("result status should '400 bad request'").isEqualTo(BAD_REQUEST);
-            }
-        });
+        //Then
+        assertThat(status(result)).describedAs("result status should '400 bad request'").isEqualTo(BAD_REQUEST);
     }
 
     @Test
     public void newUser_confirmSignUpMode() {
-        Map<String, String> config = support.Helpers.makeTestConfig();
-        config.put("signup.require.confirm", "true");
+        //Given
+        final String loginId = "somefakeuserid";
+        Map<String, String> data = new HashMap<>();
+        data.put("loginId", loginId);
+        data.put("password", "somefakepassword");
+        data.put("email", "somefakeuserid@fake.com");
+        data.put("name", "racoon");
 
-        running(support.Helpers.makeTestApplication(config), new Runnable() {
-            @Override
-            public void run() {
-                //Given
-                final String loginId = "somefakeuserid";
-                Map<String, String> data = new HashMap<>();
-                data.put("loginId", loginId);
-                data.put("password", "somefakepassword");
-                data.put("email", "fakeuser@fake.com");
-                data.put("name", "racoon");
+        //When
+        Result result = callAction(
+                controllers.routes.ref.UserApp.newUser(),
+                fakeRequest().withFormUrlEncodedBody(data)
+        );
 
-                //When
-                Result result = callAction(
-                        controllers.routes.ref.UserApp.newUser(),
-                        fakeRequest().withFormUrlEncodedBody(data)
-                );
-
-                //Then
-                assertThat(status(result)).describedAs("result status should '303 see other'").isEqualTo(303);
-            }
-        });
+        //Then
+        assertThat(status(result)).describedAs("result status should '303 see other'").isEqualTo(303);
     }
 
     @Test
     public void findById_reserved() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                //Given
-                Map<String,String> data = new HashMap<>();
-                data.put("loginId", "messages.js");
+        //Given
+        Map<String,String> data = new HashMap<>();
+        data.put("loginId", "messages.js");
 
-                //When
-                Result result = callAction(controllers.routes.ref.UserApp.isUsed("messages.js"));
+        //When
+        Result result = callAction(controllers.routes.ref.UserApp.isUsed("messages.js"));
 
-                //Then
-                assertThat(status(result)).isEqualTo(OK);
-                assertThat(contentAsString(result)).contains("\"isReserved\":true");
-                assertThat(contentType(result)).contains("json");
-            }
-        });
+        //Then
+        assertThat(status(result)).isEqualTo(OK);
+        assertThat(contentAsString(result)).contains("\"isReserved\":true");
+        assertThat(contentType(result)).contains("json");
     }
 
     @Test
     public void authenticateWithPlainPassword() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                String loginId = "kjkmadness";
-                String password = "pass";
+        // Given
+        String loginId = "kjkmadness";
+        String password = "pass";
 
-                // When
-                User user = UserApp.authenticateWithPlainPassword(loginId, password);
+        // When
+        User user = UserApp.authenticateWithPlainPassword(loginId, password);
 
-                // Then
-                assertThat(user).isNotNull();
-                assertThat(user.isAnonymous()).isFalse();
-                assertThat(user.loginId).isEqualTo(loginId);
-            }
-        });
+        // Then
+        assertThat(user).isNotNull();
+        assertThat(user.isAnonymous()).isFalse();
+        assertThat(user.loginId).isEqualTo(loginId);
     }
 
     @Test
     public void authenticateWithPlainPasswordWrongPassword() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                String loginId = "kjkmadness";
-                String password = "wrong";
+        // Given
+        String loginId = "kjkmadness";
+        String password = "wrong";
 
-                // When
-                User user = UserApp.authenticateWithPlainPassword(loginId, password);
+        // When
+        User user = UserApp.authenticateWithPlainPassword(loginId, password);
 
-                // Then
-                assertThat(user).isNotNull();
-                assertThat(user.isAnonymous()).isTrue();
-            }
-        });
+        // Then
+        assertThat(user).isNotNull();
+        assertThat(user.isAnonymous()).isTrue();
     }
 
     @Test
     public void authenticateWithPlainPasswordNotExist() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                String loginId = "notexist";
-                String password = "pass";
+        // Given
+        String loginId = "notexist";
+        String password = "pass";
 
-                // When
-                User user = UserApp.authenticateWithPlainPassword(loginId, password);
+        // When
+        User user = UserApp.authenticateWithPlainPassword(loginId, password);
 
-                // Then
-                assertThat(user).isNotNull();
-                assertThat(user.isAnonymous()).isTrue();
-            }
-        });
+        // Then
+        assertThat(user).isNotNull();
+        assertThat(user.isAnonymous()).isTrue();
     }
 
     @Test
     public void authenticateWithHashedPassword() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                String loginId = "kjkmadness";
-                String password = "ckJUVVaOHhRDNqwbeF+j4RNqXzodXO95+aQRIbJnDK4=";
+        // Given
+        String loginId = "kjkmadness";
+        String password = "ckJUVVaOHhRDNqwbeF+j4RNqXzodXO95+aQRIbJnDK4=";
 
-                // When
-                User user = UserApp.authenticateWithHashedPassword(loginId, password);
+        // When
+        User user = UserApp.authenticateWithHashedPassword(loginId, password);
 
-                // Then
-                assertThat(user).isNotNull();
-                assertThat(user.isAnonymous()).isFalse();
-                assertThat(user.loginId).isEqualTo(loginId);
-            }
-        });
+        // Then
+        assertThat(user).isNotNull();
+        assertThat(user.isAnonymous()).isFalse();
+        assertThat(user.loginId).isEqualTo(loginId);
     }
 
     @Test
     public void authenticateWithHashedPasswordWrongPassword() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                String loginId = "kjkmadness";
-                String password = "wrong";
+        // Given
+        String loginId = "kjkmadness";
+        String password = "wrong";
 
-                // When
-                User user = UserApp.authenticateWithHashedPassword(loginId, password);
+        // When
+        User user = UserApp.authenticateWithHashedPassword(loginId, password);
 
-                // Then
-                assertThat(user).isNotNull();
-                assertThat(user.isAnonymous()).isTrue();
-            }
-        });
+        // Then
+        assertThat(user).isNotNull();
+        assertThat(user.isAnonymous()).isTrue();
     }
 
     @Test
     public void authenticateWithHashedPasswordNotExist() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                String loginId = "notexist";
-                String password = "ckJUVVaOHhRDNqwbeF+j4RNqXzodXO95+aQRIbJnDK4=";
+        // Given
+        String loginId = "notexist";
+        String password = "ckJUVVaOHhRDNqwbeF+j4RNqXzodXO95+aQRIbJnDK4=";
 
-                // When
-                User user = UserApp.authenticateWithHashedPassword(loginId, password);
+        // When
+        User user = UserApp.authenticateWithHashedPassword(loginId, password);
 
-                // Then
-                assertThat(user).isNotNull();
-                assertThat(user.isAnonymous()).isTrue();
-            }
-        });
+        // Then
+        assertThat(user).isNotNull();
+        assertThat(user.isAnonymous()).isTrue();
     }
 
     @Test
     public void login() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                String loginId = "kjkmadness";
-                String password = "pass";
-                User user = User.findByLoginId(loginId);
-                Map<String, String> data = new HashMap<>();
-                data.put("loginIdOrEmail", loginId);
-                data.put("password", password);
+        // Given
+        String loginId = "kjkmadness";
+        String password = "pass";
+        User user = User.findByLoginId(loginId);
+        Map<String, String> data = new HashMap<>();
+        data.put("loginIdOrEmail", loginId);
+        data.put("password", password);
 
-                // When
-                Result result = callAction(controllers.routes.ref.UserApp.login(), fakeRequest()
-                        .withFormUrlEncodedBody(data));
+        // When
+        Result result = callAction(controllers.routes.ref.UserApp.login(), fakeRequest()
+                .withFormUrlEncodedBody(data));
 
-                // Then
-                assertThat(status(result)).isEqualTo(SEE_OTHER);
-                assertThat(header(LOCATION, result)).isEqualTo(routes.Application.index().url());
-                assertThat(session(result)).includes(
-                        entry(UserApp.SESSION_USERID, String.valueOf(user.id)),
-                        entry(UserApp.SESSION_LOGINID, user.loginId),
-                        entry(UserApp.SESSION_USERNAME, user.name));
-            }
-        });
+        // Then
+        assertThat(status(result)).isEqualTo(SEE_OTHER);
+        assertThat(header(LOCATION, result)).isEqualTo(routes.Application.index().url());
+        assertThat(session(result)).includes(
+                entry(UserApp.SESSION_USERID, String.valueOf(user.id)),
+                entry(UserApp.SESSION_LOGINID, user.loginId),
+                entry(UserApp.SESSION_USERNAME, user.name));
     }
 
     @Test
     public void loginWrongPassword() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                String loginId = "kjkmadness";
-                String password = "wrong";
-                Map<String, String> data = new HashMap<>();
-                data.put("loginIdOrEmail", loginId);
-                data.put("password", password);
+        // Given
+        String loginId = "kjkmadness";
+        String password = "wrong";
+        Map<String, String> data = new HashMap<>();
+        data.put("loginIdOrEmail", loginId);
+        data.put("password", password);
 
-                // When
-                Result result = callAction(controllers.routes.ref.UserApp.login(), fakeRequest()
-                        .withFormUrlEncodedBody(data));
+        // When
+        Result result = callAction(controllers.routes.ref.UserApp.login(), fakeRequest()
+                .withFormUrlEncodedBody(data));
 
-                // Then
-                assertThat(status(result)).isEqualTo(SEE_OTHER);
-                assertThat(header(LOCATION, result)).isEqualTo(routes.UserApp.loginForm().url());
-                assertThat(session(result)).isEmpty();
-            }
-        });
+        // Then
+        assertThat(status(result)).isEqualTo(SEE_OTHER);
+        assertThat(header(LOCATION, result)).isEqualTo(routes.UserApp.loginForm().url());
+        assertThat(session(result)).isEmpty();
     }
 
     @Test
     public void currentUserContext() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                User expected = User.find.byId(1L);
-                context().withArg(UserApp.TOKEN_USER, expected);
+        // Given
+        User expected = User.find.byId(1L);
+        context().withArg(UserApp.TOKEN_USER, expected);
 
-                // When
-                User user = UserApp.currentUser();
+        // When
+        User user = UserApp.currentUser();
 
-                // Then
-                assertThat(user).isEqualTo(expected);
-            }
-        });
+        // Then
+        assertThat(user).isEqualTo(expected);
     }
 
     @Test
     public void currentUserSession() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                Long id = 1L;
-                context().withSession(UserApp.SESSION_USERID, String.valueOf(id));
+        // Given
+        Long id = 1L;
+        context().withSession(UserApp.SESSION_USERID, String.valueOf(id));
 
-                // When
-                User user = UserApp.currentUser();
+        // When
+        User user = UserApp.currentUser();
 
-                // Then
-                assertThat(user).isNotEqualTo(User.anonymous);
-                assertThat(user.id).isEqualTo(id);
-            }
-        });
+        // Then
+        assertThat(user).isNotEqualTo(User.anonymous);
+        assertThat(user.id).isEqualTo(id);
     }
 
     @Test
     public void currentUserSessionNotNumeric() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                Context context = context().withSession(UserApp.SESSION_USERID, "string");
+        // Given
+        Context context = context().withSession(UserApp.SESSION_USERID, "string");
 
-                // When
-                User user = UserApp.currentUser();
+        // When
+        User user = UserApp.currentUser();
 
-                // Then
-                assertThat(user).isEqualTo(User.anonymous);
-                assertThat(context.session()).isEmpty();
-            }
-        });
+        // Then
+        assertThat(user).isEqualTo(User.anonymous);
+        assertThat(context.session()).isEmpty();
     }
 
     @Test
     public void currentUserSessionNoUser() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                Context context = context().withSession(UserApp.SESSION_USERID, "0");
+        // Given
+        Context context = context().withSession(UserApp.SESSION_USERID, "0");
 
-                // When
-                User user = UserApp.currentUser();
+        // When
+        User user = UserApp.currentUser();
 
-                // Then
-                assertThat(user).isEqualTo(User.anonymous);
-                assertThat(context.session()).isEmpty();
-            }
-        });
+        // Then
+        assertThat(user).isEqualTo(User.anonymous);
+        assertThat(context.session()).isEmpty();
     }
 
     @Test
     public void currentUserToken() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                String loginId = "kjkmadness";
-                String password = "ckJUVVaOHhRDNqwbeF+j4RNqXzodXO95+aQRIbJnDK4=";
-                String token = loginId + UserApp.TOKEN_SEPARATOR + password;
-                Context context = context().withCookie(UserApp.TOKEN, token);
+        // Given
+        String loginId = "kjkmadness";
+        String password = "ckJUVVaOHhRDNqwbeF+j4RNqXzodXO95+aQRIbJnDK4=";
+        String token = loginId + UserApp.TOKEN_SEPARATOR + password;
+        Context context = context().withCookie(UserApp.TOKEN, token);
 
-                // When
-                User user = UserApp.currentUser();
+        // When
+        User user = UserApp.currentUser();
 
-                // Then
-                assertThat(user).isNotEqualTo(User.anonymous);
-                assertThat(user.loginId).isEqualTo(loginId);
-                assertThat(context.session()).includes(
-                        entry(UserApp.SESSION_USERID, String.valueOf(user.id)),
-                        entry(UserApp.SESSION_LOGINID, user.loginId),
-                        entry(UserApp.SESSION_USERNAME, user.name));
-            }
-        });
+        // Then
+        assertThat(user).isNotEqualTo(User.anonymous);
+        assertThat(user.loginId).isEqualTo(loginId);
+        assertThat(context.session()).includes(
+                entry(UserApp.SESSION_USERID, String.valueOf(user.id)),
+                entry(UserApp.SESSION_LOGINID, user.loginId),
+                entry(UserApp.SESSION_USERNAME, user.name));
     }
 
     @Test
     public void currentUserTokenInvalidLength() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                String loginId = "kjkmadness";
-                String password = "ckJUVVaOHhRDNqwbeF+j4RNqXzodXO95+aQRIbJnDK4=";
-                String token = loginId + UserApp.TOKEN_SEPARATOR + password
-                        + UserApp.TOKEN_SEPARATOR + "dummy";
-                Context context = context().withCookie(UserApp.TOKEN, token);
+        // Given
+        String loginId = "kjkmadness";
+        String password = "ckJUVVaOHhRDNqwbeF+j4RNqXzodXO95+aQRIbJnDK4=";
+        String token = loginId + UserApp.TOKEN_SEPARATOR + password
+                + UserApp.TOKEN_SEPARATOR + "dummy";
+        Context context = context().withCookie(UserApp.TOKEN, token);
 
-                // When
-                User user = UserApp.currentUser();
+        // When
+        User user = UserApp.currentUser();
 
-                // Then
-                assertThat(user).isEqualTo(User.anonymous);
-                assertThat(context.session()).isEmpty();
-                verify(context.response()).discardCookie(UserApp.TOKEN);
-            }
-        });
+        // Then
+        assertThat(user).isEqualTo(User.anonymous);
+        assertThat(context.session()).isEmpty();
+        verify(context.response()).discardCookie(UserApp.TOKEN);
     }
 
     @Test
     public void currentUserTokenNoUser() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                String loginId = "kjkmadness";
-                String password = "dummy";
-                String token = loginId + UserApp.TOKEN_SEPARATOR + password;
-                Context context = context().withCookie(UserApp.TOKEN, token);
+        // Given
+        String loginId = "kjkmadness";
+        String password = "dummy";
+        String token = loginId + UserApp.TOKEN_SEPARATOR + password;
+        Context context = context().withCookie(UserApp.TOKEN, token);
 
-                // When
-                User user = UserApp.currentUser();
+        // When
+        User user = UserApp.currentUser();
 
-                // Then
-                assertThat(user).isEqualTo(User.anonymous);
-                assertThat(context.session()).isEmpty();
-                verify(context.response()).discardCookie(UserApp.TOKEN);
-            }
-        });
+        // Then
+        assertThat(user).isEqualTo(User.anonymous);
+        assertThat(context.session()).isEmpty();
+        verify(context.response()).discardCookie(UserApp.TOKEN);
     }
 
     @Test
     public void currentUserAnonymous() {
-        running(support.Helpers.makeTestApplication(), new Runnable() {
-            @Override
-            public void run() {
-                // Given
-                Context context = context();
+        // Given
+        Context context = context();
 
-                // When
-                User user = UserApp.currentUser();
+        // When
+        User user = UserApp.currentUser();
 
-                // Then
-                assertThat(user).isEqualTo(User.anonymous);
-                assertThat(context.session()).isEmpty();
-            }
-        });
+        // Then
+        assertThat(user).isEqualTo(User.anonymous);
+        assertThat(context.session()).isEmpty();
     }
 }

0431e4c

85ca03e

test/controllers/WatchProjectAppTest.java

--- test/controllers/WatchProjectAppTest.java

+++ test/controllers/WatchProjectAppTest.java


 import models.enumeration.EventType;
 import models.enumeration.ProjectScope;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 
 import play.mvc.Http;
 import play.mvc.Result;
 import play.test.FakeApplication;
 import play.test.FakeRequest;
+import play.test.Helpers;
+
+import java.util.Map;
 
 public class WatchProjectAppTest {
-    private static FakeApplication app;
+    protected static FakeApplication app;
 
-    @Before
-    public void before() {
+    @BeforeClass
+    public static void beforeClass() {
+        callAction(
+                routes.ref.Application.init()
+        );
+
         app = support.Helpers.makeTestApplication();
-        start(app);
+        Helpers.start(app);
     }
 
-    @After
-    public void after() {
-        stop(app);
+    @AfterClass
+    public static void afterClass() {
+        Helpers.stop(app);
     }
 
     @Test

0431e4c

85ca03e

test/models/ModelTest.java

--- test/models/ModelTest.java

+++ test/models/ModelTest.java


 package models;
 
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import play.test.FakeApplication;
 import play.test.Helpers;
 //import support.EbeanUtil;

     }
 
     @Before
-    public void startApp() {
+    public  void startApp() {
         app = support.Helpers.makeTestApplication();
         Helpers.start(app);
     }

0431e4c

85ca03e

test/models/PasswordResetTest.java

--- test/models/PasswordResetTest.java

+++ test/models/PasswordResetTest.java


 
         //Then
         assertThat(result).isTrue();
-        assertThat(UserApp.authenticateWithPlainPassword(userId, newPassword).isAnonymous()).isFalse();
+        assertThat(UserApp.authenticateWithPlainPassword(userId, newPassword)).isEqualTo(User.findByLoginId(userId));
     }
 
     @Test
     public void testResetPassword_wrongHash() {
         //Given
         String userId = "doortts";
-        String newPassword = "whffudy";
+        String newPassword = "gomdol";
         String hashString = PasswordReset.generateResetHash(userId);
         PasswordReset.addHashToResetTable(userId, hashString);
 

 
         //Then
         assertThat(result).isFalse();
-        assertThat(UserApp.authenticateWithPlainPassword(userId, newPassword).isAnonymous()).isTrue();
+        assertThat(UserApp.authenticateWithPlainPassword(userId, newPassword)).isEqualTo(User.anonymous);
     }
 
     private static boolean hashStringExist(String loginId) {

0431e4c

85ca03e

test/playRepository/GitRepositoryTest.java

--- test/playRepository/GitRepositoryTest.java

+++ test/playRepository/GitRepositoryTest.java


 import org.eclipse.jgit.api.CommitCommand;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.api.errors.NoFilepatternException;
 import org.eclipse.jgit.lib.*;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevTree;
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.transport.RefSpec;
 import org.eclipse.jgit.treewalk.TreeWalk;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.*;
 
+import org.junit.rules.TestWatcher;
 import play.test.FakeApplication;
 import play.test.Helpers;
 

 import static org.fest.assertions.Fail.fail;
 
 public class GitRepositoryTest {
+
+    @Rule
+    public TestWatcher watcher = new ExecutionTimeWatcher();
 
     @Before
     public void before() {

                 }
             }
         });
-    }
-
-    @Ignore
-    @Test
-    public void getRawFile() throws Exception {
-        // Given
-        String userName = "yobi";
-        String projectName = "testProject";
-        GitRepository repo = new GitRepository(userName, projectName);
-        // When
-        repo.getRawFile("HEAD", "readme");
-        // Then
     }
 
     @Test

0431e4c

85ca03e

test/support/ExecutionTimeWatcher.java (Renamed from test/playRepository/ExecutionTimeWatcher.java)

--- test/playRepository/ExecutionTimeWatcher.java

+++ test/support/ExecutionTimeWatcher.java

...	...	@@ -1,4 +1,4 @@
1		-package playRepository;
	1	+package support;
2	2
3	3	import org.joda.time.DateTime;
4	4	import org.joda.time.Interval;

0431e4c

85ca03e

test/support/Helpers.java

--- test/support/Helpers.java

+++ test/support/Helpers.java


         return makeTestApplicationWithServiceGlobal(makeTestConfig());
     }
 
-    private static void insertInitialData() {
+    public static void insertInitialData() {
         YamlUtil.insertDataFromYaml("initial-data.yml", new String[] {"users", "roles", "siteAdmins"});
     }
 
-    private static void insertTestData() {
+    public static void insertTestData() {
         YamlUtil.insertDataFromYaml("test-data.yml", new String[] {
                 "users", "projects", "pullRequests", "milestones",
                 "issues", "issueComments", "postings",

Add a comment

Open 0
Closed 0

List

...	...	@@ -48,20 +48,16 @@
48	48	}
49	49
50	50	public static void addHashToResetTable(String userId, String hashString) {
51		- Logger.debug(">> add to HashTable " + userId + ":" + hashString);
52	51	PasswordReset.resetHashMap.put(userId, hashString);
53	52	resetHashTimetable.put(hashString, new DateTime().getMillis());
54	53	}
55	54
56	55	public static boolean isValidResetHash(String hashString) {
57		- Logger.debug("Reset hash entry size:" + resetHashMap.size());
58	56	if( !resetHashMap.containsValue(hashString) ) {
59		- Logger.debug("HashString doesn't exists in resetHashMap: " + hashString);
60	57	return false;
61	58	}
62	59
63	60	if(isExpired(hashString)) {
64		- Logger.debug("HashString was expired: " + hashString);
65	61	return false;
66	62	}
67	63

...	...	@@ -40,22 +40,52 @@
40	40	import org.eclipse.jgit.api.Git;
41	41	import org.eclipse.jgit.lib.Repository;
42	42	import org.eclipse.jgit.transport.RefSpec;
43		-import org.junit.After;
44		-import org.junit.Before;
45		-import org.junit.BeforeClass;
46		-import org.junit.Test;
	43	+import org.junit.*;
47	44
	45	+import org.junit.rules.TestWatcher;
48	46	import play.mvc.Result;
49	47	import play.test.FakeApplication;
50	48	import play.test.Helpers;
	49	+import support.ExecutionTimeWatcher;
51	50	import playRepository.GitRepository;
52	51
53	52	public class PullRequestAppTest {
54		- protected FakeApplication app;
	53	+ protected static FakeApplication app;
55	54
56	55	private String ownerLoginId;
57	56	private String projectName;
58	57	private Long pullRequestNumber;
	58	+ private static PullRequest pullRequest;
	59	+ private static boolean isInit = false;
	60	+
	61	+ @Rule
	62	+ public TestWatcher watcher = new ExecutionTimeWatcher();
	63	+
	64	+ @BeforeClass
	65	+ public static void beforeClass() {
	66	+ callAction(
	67	+ routes.ref.Application.init()
	68	+ );
	69	+ app = support.Helpers.makeTestApplication();
	70	+ Helpers.start(app);
	71	+ }
	72	+
	73	+ @Before
	74	+ public void before() {
	75	+ GitRepository.setRepoPrefix("resources/test/repo/git/");
	76	+ GitRepository.setRepoForMergingPrefix("resources/test/repo/git-merging/");
	77	+ }
	78	+
	79	+ @AfterClass
	80	+ public static void afterClase(){
	81	+ Helpers.stop(app);
	82	+ }
	83	+
	84	+ @After
	85	+ public void after() {
	86	+ support.Files.rm_rf(new File(GitRepository.getRepoPrefix()));
	87	+ support.Files.rm_rf(new File(GitRepository.getRepoForMergingPrefix()));
	88	+ }
59	89
60	90	@Test
61	91	public void testCloseAnonymous() throws Exception {
...	...	@@ -103,8 +133,8 @@
103	133	Result result = callAction(
104	134	controllers.routes.ref.PullRequestApp.close(ownerLoginId, projectName, pullRequestNumber),
105	135	fakeRequest("GET", "/" + ownerLoginId + "/" + projectName + "/pullRequest/" + pullRequestNumber)
106		- .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
107		- );
	136	+ .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
	137	+ );
108	138
109	139	assertThat(status(result)).isEqualTo(SEE_OTHER);
110	140	assertThat(PullRequest.findById(pullRequestNumber).state).isEqualTo(State.CLOSED);
...	...	@@ -114,6 +144,13 @@
114	144	public void testClosePullRequestNotAllow() throws Exception {
115	145	initParameters("yobi", "projectYobi", 1L);
116	146	User currentUser = User.findByLoginId("alecsiel");
	147	+ User projectOwner = User.findByLoginId("yobi");
	148	+
	149	+ callAction(
	150	+ controllers.routes.ref.PullRequestApp.open(ownerLoginId, projectName, pullRequestNumber),
	151	+ fakeRequest("GET", "/" + ownerLoginId + "/" + projectName + "/pullRequest/" + pullRequestNumber)
	152	+ .withSession(UserApp.SESSION_USERID, projectOwner.id.toString())
	153	+ );
117	154
118	155	Result result = callAction(
119	156	controllers.routes.ref.PullRequestApp.close(ownerLoginId, projectName, pullRequestNumber),
...	...	@@ -222,8 +259,8 @@
222	259	Result result = callAction(
223	260	controllers.routes.ref.PullRequestApp.newFork(ownerLoginId, projectName, null),
224	261	fakeRequest("GET", "/" + ownerLoginId + "/" + projectName + "/newFork")
225		- .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
226		- );
	262	+ .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
	263	+ );
227	264
228	265	assertThat(status(result)).isEqualTo(OK);
229	266	}
...	...	@@ -236,8 +273,8 @@
236	273	Result result = callAction(
237	274	controllers.routes.ref.PullRequestApp.newFork(ownerLoginId, projectName, null),
238	275	fakeRequest("GET", "/" + ownerLoginId + "/" + projectName + "/newFork")
239		- .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
240		- );
	276	+ .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
	277	+ );
241	278
242	279	assertThat(status(result)).isEqualTo(FORBIDDEN);
243	280	}
...	...	@@ -255,9 +292,9 @@
255	292	Result result = callAction(
256	293	controllers.routes.ref.PullRequestApp.fork(ownerLoginId, projectName),
257	294	fakeRequest("GET", "/" + ownerLoginId + "/" + projectName + "/fork")
258		- .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
259		- .withFormUrlEncodedBody(data)
260		- );
	295	+ .withSession(UserApp.SESSION_USERID, currentUser.id.toString())
	296	+ .withFormUrlEncodedBody(data)
	297	+ );
261	298
262	299	assertThat(status(result)).isEqualTo(OK);
263	300	}
...	...	@@ -310,41 +347,30 @@
310	347
311	348	@Test
312	349	public void testOpenRoute() throws Exception {
	350	+ //Given
313	351	initParameters("yobi", "projectYobi", 1L);
314		- String url = "/" + ownerLoginId + "/" + projectName + "/pullRequest/" + pullRequestNumber + "/open";
315	352	User currentUser = User.findByLoginId("yobi");
	353	+ User projectOwner = User.findByLoginId("yobi");
316	354
	355	+ String url = "/" + ownerLoginId + "/" + projectName + "/pullRequest/" + pullRequestNumber + "/open";
	356	+ callAction(
	357	+ controllers.routes.ref.PullRequestApp.open(ownerLoginId, projectName, pullRequestNumber),
	358	+ fakeRequest("GET", "/" + ownerLoginId + "/" + projectName + "/pullRequest/" + pullRequestNumber)
	359	+ .withSession(UserApp.SESSION_USERID, projectOwner.id.toString())
	360	+ );
	361	+
	362	+ //When
317	363	Result result = route(
318	364	fakeRequest(POST, url).withSession(UserApp.SESSION_USERID, currentUser.id.toString())
319	365	);
	366	+
	367	+ //Then
320	368	assertThat(status(result)).isEqualTo(BAD_REQUEST);
321	369
322	370	Project project = Project.findByOwnerAndProjectName(ownerLoginId, projectName);
323	371	PullRequest pullRequest = PullRequest.findOne(project, pullRequestNumber);
324	372
325	373	assertThat(pullRequest.state).isEqualTo(State.OPEN);
326		- }
327		-
328		- @BeforeClass
329		- public static void beforeClass() {
330		- callAction(
331		- routes.ref.Application.init()
332		- );
333		- }
334		-
335		- @Before
336		- public void before() {
337		- GitRepository.setRepoPrefix("resources/test/repo/git/");
338		- GitRepository.setRepoForMergingPrefix("resources/test/repo/git-merging/");
339		- app = support.Helpers.makeTestApplication();
340		- Helpers.start(app);
341		- }
342		-
343		- @After
344		- public void after() {
345		- Helpers.stop(app);
346		- support.Files.rm_rf(new File(GitRepository.getRepoPrefix()));
347		- support.Files.rm_rf(new File(GitRepository.getRepoForMergingPrefix()));
348	374	}
349	375
350	376	private void initParameters(String ownerLoginId, String projectName, Long pullRequestNumber)

...	...	@@ -156,14 +156,14 @@
156	156
157	157	//Then
158	158	assertThat(result).isTrue();
159		- assertThat(UserApp.authenticateWithPlainPassword(userId, newPassword).isAnonymous()).isFalse();
	159	+ assertThat(UserApp.authenticateWithPlainPassword(userId, newPassword)).isEqualTo(User.findByLoginId(userId));
160	160	}
161	161
162	162	@Test
163	163	public void testResetPassword_wrongHash() {
164	164	//Given
165	165	String userId = "doortts";
166		- String newPassword = "whffudy";
	166	+ String newPassword = "gomdol";
167	167	String hashString = PasswordReset.generateResetHash(userId);
168	168	PasswordReset.addHashToResetTable(userId, hashString);
169	169
...	...	@@ -173,7 +173,7 @@
173	173
174	174	//Then
175	175	assertThat(result).isFalse();
176		- assertThat(UserApp.authenticateWithPlainPassword(userId, newPassword).isAnonymous()).isTrue();
	176	+ assertThat(UserApp.authenticateWithPlainPassword(userId, newPassword)).isEqualTo(User.anonymous);
177	177	}
178	178
179	179	private static boolean hashStringExist(String loginId) {

...	...	@@ -24,6 +24,7 @@
24	24	state: ACTIVE
25	25	email: doortts@gmail.com
26	26	createdDate: 2012-07-01 08:00:00
	27	+ state: ACTIVE
27	28	- !!models.User
28	29	name: eungjun
29	30	loginId: nori

...	...	@@ -1,5 +1,5 @@
1	1	import sbt._
2		-import Keys._
	2	+import sbt.Keys._
3	3	import play.Project.javaCore
4	4	import play.Project.javaJdbc
5	5	import play.Project.javaEbean
...	...	@@ -65,7 +65,7 @@
65	65	templatesImport += "models.enumeration._",
66	66	lessEntryPoints <<= baseDirectory(_ / "app" / "assets" / "stylesheets" ** "yobi.less"),
67	67	// jacoco.settings:_*,
68		- javaOptions in test ++= Seq("-Xmx512m", "-XX:MaxPermSize=512m", "-Dfile.encoding=UTF-8"),
	68	+ javaOptions in test ++= Seq("-Xmx2g", "-Xms1g", "-XX:MaxPermSize=1g", "-Dfile.encoding=UTF-8"),
69	69	javacOptions ++= Seq("-Xlint:all", "-Xlint:-path"),
70	70	scalacOptions ++= Seq("-feature")
71	71	)

...	...	@@ -56,13 +56,12 @@
56	56	callAction(
57	57	routes.ref.Application.init()
58	58	);
	59	+ app = support.Helpers.makeTestApplication();
	60	+ Helpers.start(app);
59	61	}
60	62
61	63	@Before
62	64	public void before() {
63		- app = support.Helpers.makeTestApplication();
64		- Helpers.start(app);
65		-
66	65	admin = User.findByLoginId("admin");
67	66	manager = User.findByLoginId("yobi");
68	67	member = User.findByLoginId("laziel");

...	...	@@ -33,16 +33,16 @@
33	33	import play.test.FakeApplication;
34	34
35	35	public class EnrollProjectAppTest {
36		- private FakeApplication application;
	36	+ private static FakeApplication application;
37	37
38		- @Before
39		- public void before() {
	38	+ @BeforeClass
	39	+ public static void beforeClass() {
40	40	application = support.Helpers.makeTestApplication();
41	41	start(application);
42	42	}
43	43
44		- @After
45		- public void after() {
	44	+ @AfterClass
	45	+ public static void afterClass() {
46	46	stop(application);
47	47	}
48	48

...	...	@@ -31,9 +31,7 @@
31	31	import models.Project;
32	32	import models.User;
33	33
34		-import org.junit.After;
35		-import org.junit.Before;
36		-import org.junit.Test;
	34	+import org.junit.*;
37	35
38	36	import controllers.routes.ref;
39	37
...	...	@@ -46,14 +44,14 @@
46	44	import utils.Constants;
47	45
48	46	public class ImportAppTest {
49		- private FakeApplication application;
50		- private User yobi;
51		- private Project src;
52		- private Project dest;
53		- private Map<String, String> formData;
	47	+ private static FakeApplication application;
	48	+ private static User yobi;
	49	+ private static Project src;
	50	+ private static Project dest;
	51	+ private static Map<String, String> formData;
54	52
55		- @Before
56		- public void before() throws Exception {
	53	+ @BeforeClass
	54	+ public static void before() throws Exception {
57	55	GitRepository.setRepoPrefix("resources/test/repo/git/");
58	56	GitRepository.setRepoForMergingPrefix("resources/test/repo/git-merging/");
59	57	application = support.Helpers.makeTestApplication();
...	...	@@ -65,8 +63,8 @@
65	63	formData = new HashMap<>();
66	64	}
67	65
68		- @After
69		- public void after() {
	66	+ @AfterClass
	67	+ public static void after() {
70	68	stop(application);
71	69	support.Files.rm_rf(new File(GitRepository.getRepoPrefix()));
72	70	support.Files.rm_rf(new File(GitRepository.getRepoForMergingPrefix()));
...	...	@@ -191,14 +189,14 @@
191	189	assertThat(contentAsString(result)).contains(Messages.get(Lang.defaultLang(), "project.name.alert"));
192	190	}
193	191
194		- private Project project(String owner, String name) {
	192	+ private static Project project(String owner, String name) {
195	193	Project project = new Project();
196	194	project.owner = owner;
197	195	project.name = name;
198	196	return project;
199	197	}
200	198
201		- private void createRepository(Project project) throws Exception {
	199	+ private static void createRepository(Project project) throws Exception {
202	200	GitRepository gitRepository = new GitRepository(project);
203	201	gitRepository.create();
204	202	gitRepository.close();

...	...	@@ -67,11 +67,6 @@
67	67	Helpers.start(app);
68	68	}
69	69
70		- @After
71		- public void after() {
72		- Helpers.stop(app);
73		- }
74		-
75	70	@Test
76	71	public void label() {
77	72	//Given

...	...	@@ -35,6 +35,20 @@
35	35	protected static FakeApplication app;
36	36
37	37	/**
	38	+ * 테스트를 위해 메모리 DB로 전환
	39	+ */
	40	+ @BeforeClass
	41	+ public static void beforeClass() {
	42	+ app = support.Helpers.makeTestApplication();
	43	+ Helpers.start(app);
	44	+ }
	45	+
	46	+ @AfterClass
	47	+ public static void afterClass() {
	48	+ Helpers.stop(app);
	49	+ }
	50	+
	51	+ /**
38	52	* 잘못된 URL을 입력하여 not found return을 테스트
39	53	*/
40	54	@Test
...	...	@@ -57,19 +71,5 @@
57	71	);
58	72
59	73	assertThat(status(result)).isEqualTo(SEE_OTHER);
60		- }
61		-
62		- /**
63		- * 테스트를 위해 메모리 DB로 전환
64		- */
65		- @BeforeClass
66		- public static void beforeClass() {
67		- app = support.Helpers.makeTestApplication();
68		- Helpers.start(app);
69		- }
70		-
71		- @AfterClass
72		- public static void afterClass() {
73		- Helpers.stop(app);
74	74	}
75	75	}

...	...	@@ -23,6 +23,7 @@
23	23	import models.*;
24	24	import models.enumeration.UserState;
25	25	import org.junit.*;
	26	+import play.mvc.Result;
26	27	import play.test.FakeApplication;
27	28	import play.test.Helpers;
28	29
...	...	@@ -30,52 +31,46 @@
30	31	import java.util.Map;
31	32
32	33	import static org.fest.assertions.Assertions.assertThat;
33		-import static play.test.Helpers.callAction;
34		-import static play.test.Helpers.fakeRequest;
	34	+import static play.test.Helpers.*;
35	35
36	36	public class SiteAppTest {
37	37	protected static FakeApplication app;
38		- private User admin;
39		- private User notAdmin;
40	38
41	39	@BeforeClass
42	40	public static void beforeClass() {
43	41	callAction(
44	42	routes.ref.Application.init()
45	43	);
46		- }
47		-
48		- @Before
49		- public void before() {
50		- Map<String, String> config = support.Helpers.makeTestConfig();
51		- config.put("signup.require.confirm", "true");
52		- app = support.Helpers.makeTestApplication(config);
	44	+ app = support.Helpers.makeTestApplication();
53	45	Helpers.start(app);
54	46	}
55	47
56		- @After
57		- public void after() {
	48	+ @AfterClass
	49	+ public static void afterClass() {
58	50	Helpers.stop(app);
59	51	}
60	52
61		- @Test @Ignore //FixMe I don't know how to make a assert
	53	+
	54	+ @Test
62	55	public void testToggleUserAccountLock() {
63	56	//Given
64	57	Map<String,String> data = new HashMap<>();
65	58	final String loginId= "doortts";
66	59	data.put("loginId", loginId);
	60	+ User admin = User.find.byId(1L);
67	61
68		- User targetUser = User.findByLoginId(loginId);
69		- UserState currentIsLocked = targetUser.state;
70		-
	62	+ System.out.println(User.findByLoginId(loginId).state);
71	63	//When
72		- callAction(
	64	+
	65	+ Result result = callAction(
73	66	controllers.routes.ref.SiteApp.toggleAccountLock(loginId, "", ""),
74		- fakeRequest()
	67	+ fakeRequest(POST, routes.SiteApp.toggleAccountLock(loginId, "", "").url())
75	68	.withFormUrlEncodedBody(data)
76		- .withSession("loginId", "admin")
77		- );
	69	+ .withSession("loginId", admin.loginId)
	70	+ .withSession(UserApp.SESSION_USERID, admin.id.toString()));
78	71	//Then
79		- assertThat(User.findByLoginId(loginId).state).isNotEqualTo(currentIsLocked);
	72	+ assertThat(status(result)).isEqualTo(OK);
	73	+ assertThat(flash(result)).isEmpty();
	74	+ assertThat(User.findByLoginId(loginId).state).isEqualTo(UserState.LOCKED);
80	75	}
81	76	}

...	...	@@ -31,27 +31,32 @@
31	31	import models.enumeration.EventType;
32	32	import models.enumeration.ProjectScope;
33	33
34		-import org.junit.After;
35		-import org.junit.Before;
36		-import org.junit.Test;
	34	+import org.junit.*;
37	35
38	36	import play.mvc.Http;
39	37	import play.mvc.Result;
40	38	import play.test.FakeApplication;
41	39	import play.test.FakeRequest;
	40	+import play.test.Helpers;
	41	+
	42	+import java.util.Map;
42	43
43	44	public class WatchProjectAppTest {
44		- private static FakeApplication app;
	45	+ protected static FakeApplication app;
45	46
46		- @Before
47		- public void before() {
	47	+ @BeforeClass
	48	+ public static void beforeClass() {
	49	+ callAction(
	50	+ routes.ref.Application.init()
	51	+ );
	52	+
48	53	app = support.Helpers.makeTestApplication();
49		- start(app);
	54	+ Helpers.start(app);
50	55	}
51	56
52		- @After
53		- public void after() {
54		- stop(app);
	57	+ @AfterClass
	58	+ public static void afterClass() {
	59	+ Helpers.stop(app);
55	60	}
56	61
57	62	@Test

...	...	@@ -21,7 +21,9 @@
21	21	package models;
22	22
23	23	import org.junit.After;
	24	+import org.junit.AfterClass;
24	25	import org.junit.Before;
	26	+import org.junit.BeforeClass;
25	27	import play.test.FakeApplication;
26	28	import play.test.Helpers;
27	29	//import support.EbeanUtil;
...	...	@@ -36,7 +38,7 @@
36	38	}
37	39
38	40	@Before
39		- public void startApp() {
	41	+ public void startApp() {
40	42	app = support.Helpers.makeTestApplication();
41	43	Helpers.start(app);
42	44	}

...	...	@@ -30,18 +30,15 @@
30	30	import org.eclipse.jgit.api.CommitCommand;
31	31	import org.eclipse.jgit.api.Git;
32	32	import org.eclipse.jgit.api.errors.GitAPIException;
33		-import org.eclipse.jgit.api.errors.NoFilepatternException;
34	33	import org.eclipse.jgit.lib.*;
35	34	import org.eclipse.jgit.revwalk.RevCommit;
36	35	import org.eclipse.jgit.revwalk.RevTree;
37	36	import org.eclipse.jgit.revwalk.RevWalk;
38	37	import org.eclipse.jgit.transport.RefSpec;
39	38	import org.eclipse.jgit.treewalk.TreeWalk;
40		-import org.junit.After;
41		-import org.junit.Before;
42		-import org.junit.Ignore;
43		-import org.junit.Test;
	39	+import org.junit.*;
44	40
	41	+import org.junit.rules.TestWatcher;
45	42	import play.test.FakeApplication;
46	43	import play.test.Helpers;
47	44
...	...	@@ -57,6 +54,9 @@
57	54	import static org.fest.assertions.Fail.fail;
58	55
59	56	public class GitRepositoryTest {
	57	+
	58	+ @Rule
	59	+ public TestWatcher watcher = new ExecutionTimeWatcher();
60	60
61	61	@Before
62	62	public void before() {
...	...	@@ -321,18 +321,6 @@
321	321	}
322	322	}
323	323	});
324		- }
325		-
326		- @Ignore
327		- @Test
328		- public void getRawFile() throws Exception {
329		- // Given
330		- String userName = "yobi";
331		- String projectName = "testProject";
332		- GitRepository repo = new GitRepository(userName, projectName);
333		- // When
334		- repo.getRawFile("HEAD", "readme");
335		- // Then
336	324	}
337	325
338	326	@Test

...	...	@@ -70,11 +70,11 @@
70	70	return makeTestApplicationWithServiceGlobal(makeTestConfig());
71	71	}
72	72
73		- private static void insertInitialData() {
	73	+ public static void insertInitialData() {
74	74	YamlUtil.insertDataFromYaml("initial-data.yml", new String[] {"users", "roles", "siteAdmins"});
75	75	}
76	76
77		- private static void insertTestData() {
	77	+ public static void insertTestData() {
78	78	YamlUtil.insertDataFromYaml("test-data.yml", new String[] {
79	79	"users", "projects", "pullRequests", "milestones",
80	80	"issues", "issueComments", "postings",

Delete comment