From 7e8873a14ccc2cb25213489d7d7ba97f09673831 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 07 Dec 2011 19:14:34 -0500
Subject: [PATCH] Unit testing overhaul.
---
tests/com/gitblit/tests/RpcTests.java | 74 +++++++++++++++---------------------
1 files changed, 31 insertions(+), 43 deletions(-)
diff --git a/tests/com/gitblit/tests/RpcTests.java b/tests/com/gitblit/tests/RpcTests.java
index a64d1b8..30dc84d 100644
--- a/tests/com/gitblit/tests/RpcTests.java
+++ b/tests/com/gitblit/tests/RpcTests.java
@@ -16,6 +16,8 @@
package com.gitblit.tests;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
@@ -23,7 +25,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -31,7 +33,6 @@
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.GitBlitException.UnauthorizedException;
-import com.gitblit.GitBlitServer;
import com.gitblit.Keys;
import com.gitblit.models.FederationModel;
import com.gitblit.models.FederationProposal;
@@ -50,42 +51,28 @@
*/
public class RpcTests {
- static int port = 8180;
- static int shutdownPort = 8181;
+ String url = GitBlitSuite.url;
+ String account = GitBlitSuite.account;
+ String password = GitBlitSuite.password;
- String url = "http://localhost:" + port;
- String account = "admin";
- String password = "admin";
+ private static final AtomicBoolean started = new AtomicBoolean(false);
@BeforeClass
public static void startGitblit() throws Exception {
- // Start a Gitblit instance
- Executors.newSingleThreadExecutor().execute(new Runnable() {
- public void run() {
- GitBlitServer.main("--httpPort", "" + port, "--httpsPort", "0", "--shutdownPort",
- "" + shutdownPort, "--repositoriesFolder",
- "\"" + GitBlitSuite.REPOSITORIES.getAbsolutePath() + "\"", "--userService",
- "distrib/users.properties");
- }
- });
-
- // Wait a few seconds for it to be running
- Thread.sleep(2500);
+ started.set(GitBlitSuite.startGitblit());
}
@AfterClass
public static void stopGitblit() throws Exception {
- // Stop Gitblit
- GitBlitServer.main("--stop", "--shutdownPort", "" + shutdownPort);
-
- // Wait a few seconds for it to be running
- Thread.sleep(2500);
+ if (started.get()) {
+ GitBlitSuite.stopGitblit();
+ }
}
@Test
public void testListRepositories() throws IOException {
Map<String, RepositoryModel> map = RpcUtils.getRepositories(url, null, null);
- assertTrue("Repository list is null!", map != null);
+ assertNotNull("Repository list is null!", map);
assertTrue("Repository list is empty!", map.size() > 0);
}
@@ -96,7 +83,7 @@
list = RpcUtils.getUsers(url, null, null);
} catch (UnauthorizedException e) {
}
- assertTrue("Server allows anyone to admin!", list == null);
+ assertNull("Server allows anyone to admin!", list);
list = RpcUtils.getUsers(url, "admin", "admin".toCharArray());
assertTrue("User list is empty!", list.size() > 0);
@@ -113,7 +100,7 @@
RpcUtils.createUser(user, url, account, password.toCharArray()));
UserModel retrievedUser = findUser(user.username);
- assertTrue("Failed to find " + user.username, retrievedUser != null);
+ assertNotNull("Failed to find " + user.username, retrievedUser);
assertTrue("Retrieved user can not administer Gitblit", retrievedUser.canAdmin);
// rename and toggle admin permission
@@ -124,7 +111,7 @@
RpcUtils.updateUser(originalName, user, url, account, password.toCharArray()));
retrievedUser = findUser(user.username);
- assertTrue("Failed to find " + user.username, retrievedUser != null);
+ assertNotNull("Failed to find " + user.username, retrievedUser);
assertTrue("Retrieved user did not update", !retrievedUser.canAdmin);
// delete
@@ -132,7 +119,7 @@
RpcUtils.deleteUser(retrievedUser, url, account, password.toCharArray()));
retrievedUser = findUser(user.username);
- assertTrue("Failed to delete " + user.username, retrievedUser == null);
+ assertNull("Failed to delete " + user.username, retrievedUser);
}
private UserModel findUser(String name) throws IOException {
@@ -160,9 +147,8 @@
RpcUtils.createRepository(model, url, account, password.toCharArray()));
RepositoryModel retrievedRepository = findRepository(model.name);
- assertTrue("Failed to find " + model.name, retrievedRepository != null);
- assertTrue("Access retriction type is wrong",
- AccessRestrictionType.VIEW.equals(retrievedRepository.accessRestriction));
+ assertNotNull("Failed to find " + model.name, retrievedRepository);
+ assertEquals(AccessRestrictionType.VIEW, retrievedRepository.accessRestriction);
// rename and change access restriciton
String originalName = model.name;
@@ -172,16 +158,18 @@
url, account, password.toCharArray()));
retrievedRepository = findRepository(model.name);
- assertTrue("Failed to find " + model.name, retrievedRepository != null);
+ assertNotNull("Failed to find " + model.name, retrievedRepository);
assertTrue("Access retriction type is wrong",
AccessRestrictionType.PUSH.equals(retrievedRepository.accessRestriction));
// memberships
- String testMember = "justadded";
+ UserModel testMember = new UserModel("justadded");
+ assertTrue(RpcUtils.createUser(testMember, url, account, password.toCharArray()));
+
List<String> members = RpcUtils.getRepositoryMembers(retrievedRepository, url, account,
password.toCharArray());
- assertTrue("Membership roster is not empty!", members.size() == 0);
- members.add(testMember);
+ assertEquals("Membership roster is not empty!", 0, members.size());
+ members.add(testMember.username);
assertTrue(
"Failed to set memberships!",
RpcUtils.setRepositoryMembers(retrievedRepository, members, url, account,
@@ -190,7 +178,7 @@
password.toCharArray());
boolean foundMember = false;
for (String member : members) {
- if (member.equalsIgnoreCase(testMember)) {
+ if (member.equalsIgnoreCase(testMember.username)) {
foundMember = true;
break;
}
@@ -202,11 +190,11 @@
url, account, password.toCharArray()));
retrievedRepository = findRepository(model.name);
- assertTrue("Failed to delete " + model.name, retrievedRepository == null);
+ assertNull("Failed to delete " + model.name, retrievedRepository);
for (UserModel u : RpcUtils.getUsers(url, account, password.toCharArray())) {
- if (u.username.equals(testMember)) {
- RpcUtils.deleteUser(u, url, account, password.toCharArray());
+ if (u.username.equals(testMember.username)) {
+ assertTrue(RpcUtils.deleteUser(u, url, account, password.toCharArray()));
break;
}
}
@@ -255,13 +243,13 @@
@Test
public void testSettings() throws Exception {
ServerSettings settings = RpcUtils.getSettings(url, account, password.toCharArray());
- assertTrue("No settings were retrieved!", settings != null);
+ assertNotNull("No settings were retrieved!", settings);
}
@Test
public void testServerStatus() throws Exception {
ServerStatus status = RpcUtils.getStatus(url, account, password.toCharArray());
- assertTrue("No status was retrieved!", status != null);
+ assertNotNull("No status was retrieved!", status);
}
@Test
@@ -292,7 +280,7 @@
public void testBranches() throws Exception {
Map<String, Collection<String>> branches = RpcUtils.getBranches(url, account,
password.toCharArray());
- assertTrue(branches != null);
+ assertNotNull(branches);
assertTrue(branches.size() > 0);
}
}
--
Gitblit v1.9.1