From d03aff630cbcd49f02d51f08ec59ac3cf7f41d0e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 23 Oct 2011 10:25:39 -0400
Subject: [PATCH] Separate management from administration in rpc servlet.
---
tests/com/gitblit/tests/RpcTests.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/tests/com/gitblit/tests/RpcTests.java b/tests/com/gitblit/tests/RpcTests.java
index cb98a56..11a340a 100644
--- a/tests/com/gitblit/tests/RpcTests.java
+++ b/tests/com/gitblit/tests/RpcTests.java
@@ -27,6 +27,8 @@
import com.gitblit.models.FederationProposal;
import com.gitblit.models.FederationSet;
import com.gitblit.models.RepositoryModel;
+import com.gitblit.models.ServerSettings;
+import com.gitblit.models.ServerStatus;
import com.gitblit.models.UserModel;
import com.gitblit.utils.RpcUtils;
@@ -159,6 +161,13 @@
retrievedRepository = findRepository(model.name);
assertTrue("Failed to delete " + model.name, retrievedRepository == null);
+
+ for (UserModel u : RpcUtils.getUsers(url, account, password.toCharArray())) {
+ if (u.username.equals(testMember)) {
+ RpcUtils.deleteUser(u, url, account, password.toCharArray());
+ break;
+ }
+ }
}
private RepositoryModel findRepository(String name) throws IOException {
@@ -185,16 +194,25 @@
account, password.toCharArray());
assertTrue("No federation result registrations were retrieved!", registrations.size() > 0);
}
-
+
public void testFederationProposals() throws Exception {
- List<FederationProposal> proposals = RpcUtils.getFederationProposals(url,
- account, password.toCharArray());
+ List<FederationProposal> proposals = RpcUtils.getFederationProposals(url, account,
+ password.toCharArray());
assertTrue("No federation proposals were retrieved!", proposals.size() > 0);
}
-
+
public void testFederationSets() throws Exception {
- List<FederationSet> sets = RpcUtils.getFederationSets(url,
- account, password.toCharArray());
+ List<FederationSet> sets = RpcUtils.getFederationSets(url, account, password.toCharArray());
assertTrue("No federation sets were retrieved!", sets.size() > 0);
}
+
+ public void testSettings() throws Exception {
+ ServerSettings settings = RpcUtils.getSettings(url, account, password.toCharArray());
+ assertTrue("No settings were retrieved!", settings != null);
+ }
+
+ public void testServerStatus() throws Exception {
+ ServerStatus status = RpcUtils.getStatus(url, account, password.toCharArray());
+ assertTrue("No status was retrieved!", status != null);
+ }
}
--
Gitblit v1.9.1