Fixed bug in time utils. Updated some unit tests.

diff --git a/src/com/gitblit/utils/TimeUtils.java b/src/com/gitblit/utils/TimeUtils.java
index 3f0f41257a639fe510144da25df41481fc451f6c..7ac1e79f6724e960ff45f21cec8244b90427a21c 100644 (file)
--- a/src/com/gitblit/utils/TimeUtils.java
+++ b/src/com/gitblit/utils/TimeUtils.java
@@ -15,6 +15,7 @@
  */\r
 package com.gitblit.utils;\r
 \r
+import java.text.SimpleDateFormat;\r
 import java.util.Calendar;\r
 import java.util.Date;\r
 \r
@@ -53,9 +54,10 @@ public class TimeUtils {
         */\r
        public static boolean isYesterday(Date date) {\r
                Calendar cal = Calendar.getInstance();\r
-               cal.setTime(date);\r
-               cal.add(Calendar.DATE, 1);\r
-               return (System.currentTimeMillis() - cal.getTimeInMillis()) < ONEDAY;\r
+               cal.setTime(new Date());\r
+               cal.add(Calendar.DATE, -1);\r
+               SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");\r
+               return df.format(cal.getTime()).equals(df.format(date));\r
        }\r
 \r
        /**\r

diff --git a/tests/com/gitblit/tests/GitServletTest.java b/tests/com/gitblit/tests/GitServletTest.java
index 6a839742741efea0c0d69ccb594a1b92a1b743ed..89466d7fa5b02c2ad86a3f7fcb53e3b51f27c3b9 100644 (file)
--- a/tests/com/gitblit/tests/GitServletTest.java
+++ b/tests/com/gitblit/tests/GitServletTest.java
@@ -8,25 +8,26 @@ import java.text.MessageFormat;
 import java.util.Date;\r
 import java.util.concurrent.Executors;\r
 \r
-import junit.framework.TestCase;\r
-\r
 import org.eclipse.jgit.api.CloneCommand;\r
 import org.eclipse.jgit.api.Git;\r
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;\r
 import org.eclipse.jgit.util.FileUtils;\r
+import org.junit.AfterClass;\r
+import org.junit.BeforeClass;\r
+import org.junit.Test;\r
 \r
 import com.gitblit.GitBlitServer;\r
 \r
-public class GitServletTest extends TestCase {\r
+public class GitServletTest {\r
 \r
        File folder = new File(GitBlitSuite.REPOSITORIES, "working/ticgit");\r
 \r
-       int port = 8180;\r
+       static int port = 8180;\r
 \r
-       int shutdownPort = 8181;\r
+       static int shutdownPort = 8181;\r
 \r
-       @Override\r
-       protected void setUp() throws Exception {\r
+       @BeforeClass\r
+       public static void startGitblit() throws Exception {\r
                // Start a Gitblit instance\r
                Executors.newSingleThreadExecutor().execute(new Runnable() {\r
                        public void run() {\r
@@ -41,8 +42,8 @@ public class GitServletTest extends TestCase {
                Thread.sleep(2500);\r
        }\r
 \r
-       @Override\r
-       protected void tearDown() throws Exception {\r
+       @AfterClass\r
+       public static void stopGitblit() throws Exception {\r
                // Stop Gitblit\r
                GitBlitServer.main("--stop", "--shutdownPort", "" + shutdownPort);\r
 \r
@@ -50,6 +51,7 @@ public class GitServletTest extends TestCase {
                Thread.sleep(2500);\r
        }\r
 \r
+       @Test\r
        public void testClone() throws Exception {\r
                if (folder.exists()) {\r
                        FileUtils.delete(folder, FileUtils.RECURSIVE);\r
@@ -62,6 +64,7 @@ public class GitServletTest extends TestCase {
                clone.call();\r
        }\r
 \r
+       @Test\r
        public void testAnonymousCommit() throws Exception {\r
                Git git = Git.open(folder);\r
                File file = new File(folder, "TODO");\r
@@ -74,7 +77,8 @@ public class GitServletTest extends TestCase {
                git.push().setPushAll().call();\r
                git.getRepository().close();\r
        }\r
-               \r
+\r
+       @Test\r
        public void testBogusLoginClone() throws Exception {\r
                File folder = new File(GitBlitSuite.REPOSITORIES, "working/gitblit");\r
                if (folder.exists()) {\r

diff --git a/tests/com/gitblit/tests/RpcTests.java b/tests/com/gitblit/tests/RpcTests.java
index 37a49559ccf5e027d4399ffb3bc607611154fcf0..a64d1b8737af5572cf6ac649b722cf86240e190d 100644 (file)
--- a/tests/com/gitblit/tests/RpcTests.java
+++ b/tests/com/gitblit/tests/RpcTests.java
@@ -15,16 +15,23 @@
  */\r
 package com.gitblit.tests;\r
 \r
+import static org.junit.Assert.assertEquals;\r
+import static org.junit.Assert.assertTrue;\r
+\r
 import java.io.IOException;\r
 import java.util.Collection;\r
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
+import java.util.concurrent.Executors;\r
 \r
-import junit.framework.TestCase;\r
+import org.junit.AfterClass;\r
+import org.junit.BeforeClass;\r
+import org.junit.Test;\r
 \r
 import com.gitblit.Constants.AccessRestrictionType;\r
 import com.gitblit.GitBlitException.UnauthorizedException;\r
+import com.gitblit.GitBlitServer;\r
 import com.gitblit.Keys;\r
 import com.gitblit.models.FederationModel;\r
 import com.gitblit.models.FederationProposal;\r
@@ -41,18 +48,48 @@ import com.gitblit.utils.RpcUtils;
  * @author James Moger\r
  * \r
  */\r
-public class RpcTests extends TestCase {\r
+public class RpcTests {\r
+\r
+       static int port = 8180;\r
+       static int shutdownPort = 8181;\r
 \r
-       String url = "https://localhost:8443";\r
+       String url = "http://localhost:" + port;\r
        String account = "admin";\r
        String password = "admin";\r
 \r
+       @BeforeClass\r
+       public static void startGitblit() throws Exception {\r
+               // Start a Gitblit instance\r
+               Executors.newSingleThreadExecutor().execute(new Runnable() {\r
+                       public void run() {\r
+                               GitBlitServer.main("--httpPort", "" + port, "--httpsPort", "0", "--shutdownPort",\r
+                                               "" + shutdownPort, "--repositoriesFolder",\r
+                                               "\"" + GitBlitSuite.REPOSITORIES.getAbsolutePath() + "\"", "--userService",\r
+                                               "distrib/users.properties");\r
+                       }\r
+               });\r
+\r
+               // Wait a few seconds for it to be running\r
+               Thread.sleep(2500);\r
+       }\r
+\r
+       @AfterClass\r
+       public static void stopGitblit() throws Exception {\r
+               // Stop Gitblit\r
+               GitBlitServer.main("--stop", "--shutdownPort", "" + shutdownPort);\r
+\r
+               // Wait a few seconds for it to be running\r
+               Thread.sleep(2500);\r
+       }\r
+\r
+       @Test\r
        public void testListRepositories() throws IOException {\r
                Map<String, RepositoryModel> map = RpcUtils.getRepositories(url, null, null);\r
                assertTrue("Repository list is null!", map != null);\r
                assertTrue("Repository list is empty!", map.size() > 0);\r
        }\r
 \r
+       @Test\r
        public void testListUsers() throws IOException {\r
                List<UserModel> list = null;\r
                try {\r
@@ -65,6 +102,7 @@ public class RpcTests extends TestCase {
                assertTrue("User list is empty!", list.size() > 0);\r
        }\r
 \r
+       @Test\r
        public void testUserAdministration() throws IOException {\r
                UserModel user = new UserModel("garbage");\r
                user.canAdmin = true;\r
@@ -109,6 +147,7 @@ public class RpcTests extends TestCase {
                return retrievedUser;\r
        }\r
 \r
+       @Test\r
        public void testRepositoryAdministration() throws IOException {\r
                RepositoryModel model = new RepositoryModel();\r
                model.name = "garbagerepo.git";\r
@@ -186,39 +225,46 @@ public class RpcTests extends TestCase {
                return retrievedRepository;\r
        }\r
 \r
+       @Test\r
        public void testFederationRegistrations() throws Exception {\r
                List<FederationModel> registrations = RpcUtils.getFederationRegistrations(url, account,\r
                                password.toCharArray());\r
-               assertTrue("No federation registrations wre retrieved!", registrations.size() > 0);\r
+               assertTrue("No federation registrations were retrieved!", registrations.size() >= 0);\r
        }\r
 \r
+       @Test\r
        public void testFederationResultRegistrations() throws Exception {\r
                List<FederationModel> registrations = RpcUtils.getFederationResultRegistrations(url,\r
                                account, password.toCharArray());\r
-               assertTrue("No federation result registrations were retrieved!", registrations.size() > 0);\r
+               assertTrue("No federation result registrations were retrieved!", registrations.size() >= 0);\r
        }\r
 \r
+       @Test\r
        public void testFederationProposals() throws Exception {\r
                List<FederationProposal> proposals = RpcUtils.getFederationProposals(url, account,\r
                                password.toCharArray());\r
-               assertTrue("No federation proposals were retrieved!", proposals.size() > 0);\r
+               assertTrue("No federation proposals were retrieved!", proposals.size() >= 0);\r
        }\r
 \r
+       @Test\r
        public void testFederationSets() throws Exception {\r
                List<FederationSet> sets = RpcUtils.getFederationSets(url, account, password.toCharArray());\r
-               assertTrue("No federation sets were retrieved!", sets.size() > 0);\r
+               assertTrue("No federation sets were retrieved!", sets.size() >= 0);\r
        }\r
 \r
+       @Test\r
        public void testSettings() throws Exception {\r
                ServerSettings settings = RpcUtils.getSettings(url, account, password.toCharArray());\r
                assertTrue("No settings were retrieved!", settings != null);\r
        }\r
 \r
+       @Test\r
        public void testServerStatus() throws Exception {\r
                ServerStatus status = RpcUtils.getStatus(url, account, password.toCharArray());\r
                assertTrue("No status was retrieved!", status != null);\r
        }\r
 \r
+       @Test\r
        public void testUpdateSettings() throws Exception {\r
                Map<String, String> updated = new HashMap<String, String>();\r
 \r
@@ -229,8 +275,7 @@ public class RpcTests extends TestCase {
 \r
                // update setting\r
                updated.put(Keys.web.showRepositorySizes, String.valueOf(showSizes));\r
-               boolean success = RpcUtils.updateSettings(updated, "http://localhost:8080/gb", account,\r
-                               password.toCharArray());\r
+               boolean success = RpcUtils.updateSettings(updated, url, account, password.toCharArray());\r
                assertTrue("Failed to update server settings", success);\r
 \r
                // confirm setting change\r
@@ -243,6 +288,7 @@ public class RpcTests extends TestCase {
                updated.put(Keys.web.showRepositorySizes, String.valueOf(newValue));\r
        }\r
 \r
+       @Test\r
        public void testBranches() throws Exception {\r
                Map<String, Collection<String>> branches = RpcUtils.getBranches(url, account,\r
                                password.toCharArray());\r