From 143fc9d357c174a56340052618d481617686fc72 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 07 Nov 2011 21:21:28 -0500
Subject: [PATCH] Unit testing

---
 tests/com/gitblit/tests/RpcTests.java |   46 ++++++++++++++++++++++++++++++++++++----------
 1 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/tests/com/gitblit/tests/RpcTests.java b/tests/com/gitblit/tests/RpcTests.java
index 637d488..ab6a8b8 100644
--- a/tests/com/gitblit/tests/RpcTests.java
+++ b/tests/com/gitblit/tests/RpcTests.java
@@ -23,6 +23,10 @@
 
 import junit.framework.TestCase;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
 import com.gitblit.Constants.AccessRestrictionType;
 import com.gitblit.GitBlitException.UnauthorizedException;
 import com.gitblit.Keys;
@@ -42,17 +46,30 @@
  * 
  */
 public class RpcTests extends TestCase {
+	
+	String url = GitBlitSuite.url;
+	String account = GitBlitSuite.account;
+	String password = GitBlitSuite.password;
+	
 
-	String url = "https://localhost:8443";
-	String account = "admin";
-	String password = "admin";
+	@BeforeClass
+	public static void startGitblit() throws Exception {
+		GitBlitSuite.startGitblit();
+	}
 
+	@AfterClass
+	public static void stopGitblit() throws Exception {
+		GitBlitSuite.stopGitblit();
+	}
+
+	@Test
 	public void testListRepositories() throws IOException {
 		Map<String, RepositoryModel> map = RpcUtils.getRepositories(url, null, null);
 		assertTrue("Repository list is null!", map != null);
 		assertTrue("Repository list is empty!", map.size() > 0);
 	}
 
+	@Test
 	public void testListUsers() throws IOException {
 		List<UserModel> list = null;
 		try {
@@ -65,6 +82,7 @@
 		assertTrue("User list is empty!", list.size() > 0);
 	}
 
+	@Test
 	public void testUserAdministration() throws IOException {
 		UserModel user = new UserModel("garbage");
 		user.canAdmin = true;
@@ -109,6 +127,7 @@
 		return retrievedUser;
 	}
 
+	@Test
 	public void testRepositoryAdministration() throws IOException {
 		RepositoryModel model = new RepositoryModel();
 		model.name = "garbagerepo.git";
@@ -186,39 +205,46 @@
 		return retrievedRepository;
 	}
 
+	@Test
 	public void testFederationRegistrations() throws Exception {
 		List<FederationModel> registrations = RpcUtils.getFederationRegistrations(url, account,
 				password.toCharArray());
-		assertTrue("No federation registrations wre retrieved!", registrations.size() > 0);
+		assertTrue("No federation registrations were retrieved!", registrations.size() >= 0);
 	}
 
+	@Test
 	public void testFederationResultRegistrations() throws Exception {
 		List<FederationModel> registrations = RpcUtils.getFederationResultRegistrations(url,
 				account, password.toCharArray());
-		assertTrue("No federation result registrations were retrieved!", registrations.size() > 0);
+		assertTrue("No federation result registrations were retrieved!", registrations.size() >= 0);
 	}
 
+	@Test
 	public void testFederationProposals() throws Exception {
 		List<FederationProposal> proposals = RpcUtils.getFederationProposals(url, account,
 				password.toCharArray());
-		assertTrue("No federation proposals were retrieved!", proposals.size() > 0);
+		assertTrue("No federation proposals were retrieved!", proposals.size() >= 0);
 	}
 
+	@Test
 	public void testFederationSets() throws Exception {
 		List<FederationSet> sets = RpcUtils.getFederationSets(url, account, password.toCharArray());
-		assertTrue("No federation sets were retrieved!", sets.size() > 0);
+		assertTrue("No federation sets were retrieved!", sets.size() >= 0);
 	}
 
+	@Test
 	public void testSettings() throws Exception {
 		ServerSettings settings = RpcUtils.getSettings(url, account, password.toCharArray());
 		assertTrue("No settings were retrieved!", settings != null);
 	}
 
+	@Test
 	public void testServerStatus() throws Exception {
 		ServerStatus status = RpcUtils.getStatus(url, account, password.toCharArray());
 		assertTrue("No status was retrieved!", status != null);
 	}
 
+	@Test
 	public void testUpdateSettings() throws Exception {
 		Map<String, String> updated = new HashMap<String, String>();
 
@@ -229,8 +255,7 @@
 
 		// update setting
 		updated.put(Keys.web.showRepositorySizes, String.valueOf(showSizes));
-		boolean success = RpcUtils.updateSettings(updated, "http://localhost:8080/gb", account,
-				password.toCharArray());
+		boolean success = RpcUtils.updateSettings(updated, url, account, password.toCharArray());
 		assertTrue("Failed to update server settings", success);
 
 		// confirm setting change
@@ -243,8 +268,9 @@
 		updated.put(Keys.web.showRepositorySizes, String.valueOf(newValue));
 	}
 
+	@Test
 	public void testBranches() throws Exception {
-		Map<String, Collection<String>> branches = RpcUtils.getAllBranches(url, account,
+		Map<String, Collection<String>> branches = RpcUtils.getBranches(url, account,
 				password.toCharArray());
 		assertTrue(branches != null);
 		assertTrue(branches.size() > 0);

--
Gitblit v1.9.1