From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/test/java/com/gitblit/tests/FederationTests.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/FederationTests.java b/src/test/java/com/gitblit/tests/FederationTests.java
index 8475ffe..144fe3d 100644
--- a/src/test/java/com/gitblit/tests/FederationTests.java
+++ b/src/test/java/com/gitblit/tests/FederationTests.java
@@ -15,10 +15,6 @@
*/
package com.gitblit.tests;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -42,7 +38,7 @@
import com.gitblit.utils.JsonUtils;
import com.gitblit.utils.RpcUtils;
-public class FederationTests {
+public class FederationTests extends GitblitUnitTest {
String url = GitBlitSuite.url;
String account = GitBlitSuite.account;
@@ -129,23 +125,23 @@
assertNotNull(users);
// admin is excluded
assertEquals(0, users.size());
-
+
UserModel newUser = new UserModel("test");
newUser.password = "whocares";
assertTrue(RpcUtils.createUser(newUser, url, account, password.toCharArray()));
-
+
TeamModel team = new TeamModel("testteam");
team.addUser("test");
team.addRepositoryPermission("helloworld.git");
assertTrue(RpcUtils.createTeam(team, url, account, password.toCharArray()));
-
+
users = FederationUtils.getUsers(getRegistration());
assertNotNull(users);
assertEquals(1, users.size());
-
+
newUser = users.get(0);
- assertTrue(newUser.isTeamMember("testteam"));
-
+ assertTrue(newUser.isTeamMember("testteam"));
+
assertTrue(RpcUtils.deleteUser(newUser, url, account, password.toCharArray()));
assertTrue(RpcUtils.deleteTeam(team, url, account, password.toCharArray()));
}
@@ -156,14 +152,14 @@
team.addUser("test");
team.addRepositoryPermission("helloworld.git");
assertTrue(RpcUtils.createTeam(team, url, account, password.toCharArray()));
-
+
List<TeamModel> teams = FederationUtils.getTeams(getRegistration());
assertNotNull(teams);
assertTrue(teams.size() > 0);
-
+
assertTrue(RpcUtils.deleteTeam(team, url, account, password.toCharArray()));
}
-
+
@Test
public void testPullScripts() throws Exception {
Map<String, String> scripts = FederationUtils.getScripts(getRegistration());
--
Gitblit v1.9.1