From 4aafd4362caf198bdea97d2fdf2957aa5c345465 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 27 Sep 2011 08:22:26 -0400
Subject: [PATCH] Poke test during proposal phase.
---
tests/com/gitblit/tests/FederationTests.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/tests/com/gitblit/tests/FederationTests.java b/tests/com/gitblit/tests/FederationTests.java
index 903bd9c..c5f7e8d 100644
--- a/tests/com/gitblit/tests/FederationTests.java
+++ b/tests/com/gitblit/tests/FederationTests.java
@@ -24,10 +24,12 @@
import junit.framework.TestCase;
import com.gitblit.Constants.AccessRestrictionType;
+import com.gitblit.Constants.FederationProposalResult;
import com.gitblit.Constants.FederationRequest;
import com.gitblit.Constants.FederationToken;
import com.gitblit.FederationServlet;
import com.gitblit.GitBlitServer;
+import com.gitblit.models.FederationProposal;
import com.gitblit.models.RepositoryModel;
import com.gitblit.utils.FederationUtils;
import com.google.gson.Gson;
@@ -86,15 +88,19 @@
repositories.put(model.name, model);
}
+ FederationProposal proposal = new FederationProposal("http://testurl", FederationToken.ALL,
+ "testtoken", repositories);
+
// propose federation
- assertTrue("proposal refused", FederationUtils.propose("http://localhost:" + port,
- FederationToken.ALL, "testtoken", "http://testurl", repositories));
+ assertEquals("proposal refused",
+ FederationUtils.propose("http://localhost:" + port, proposal),
+ FederationProposalResult.NO_PROPOSALS);
}
public void testPullRepositories() throws Exception {
try {
- String url = FederationServlet.asPullLink("http://localhost:" + port, "testtoken",
- FederationRequest.PULL_REPOSITORIES);
+ String url = FederationServlet.asFederationLink("http://localhost:" + port,
+ "testtoken", FederationRequest.PULL_REPOSITORIES);
String json = FederationUtils.readJson(url);
} catch (IOException e) {
if (!e.getMessage().contains("403")) {
--
Gitblit v1.9.1