From a568f2ac97f4c7b73ee0cdf2007f553bb8c81c2c Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 10 Nov 2011 08:10:19 -0500 Subject: [PATCH] Refresh log on display. Adjusted spacing of status panel. --- tests/com/gitblit/tests/SyndicationUtilsTest.java | 41 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 36 insertions(+), 5 deletions(-) diff --git a/tests/com/gitblit/tests/SyndicationUtilsTest.java b/tests/com/gitblit/tests/SyndicationUtilsTest.java index 64b99bd..0a2420f 100644 --- a/tests/com/gitblit/tests/SyndicationUtilsTest.java +++ b/tests/com/gitblit/tests/SyndicationUtilsTest.java @@ -18,19 +18,22 @@ import java.io.ByteArrayOutputStream; import java.util.ArrayList; import java.util.Date; +import java.util.HashSet; import java.util.List; +import java.util.Set; import junit.framework.TestCase; -import com.gitblit.models.SyndicatedEntryModel; +import com.gitblit.Constants.SearchType; +import com.gitblit.models.FeedEntryModel; import com.gitblit.utils.SyndicationUtils; public class SyndicationUtilsTest extends TestCase { public void testSyndication() throws Exception { - List<SyndicatedEntryModel> entries = new ArrayList<SyndicatedEntryModel>(); + List<FeedEntryModel> entries = new ArrayList<FeedEntryModel>(); for (int i = 0; i < 10; i++) { - SyndicatedEntryModel entry = new SyndicatedEntryModel(); + FeedEntryModel entry = new FeedEntryModel(); entry.title = "Title " + i; entry.author = "Author " + i; entry.link = "Link " + i; @@ -39,6 +42,11 @@ entry.content = "Content " + i; entry.repository = "Repository " + i; entry.branch = "Branch " + i; + List<String> tags = new ArrayList<String>(); + for (int j = 0; j < 5; j++) { + tags.add("Tag " + j); + } + entry.tags = tags; entries.add(entry); } ByteArrayOutputStream os = new ByteArrayOutputStream(); @@ -51,8 +59,31 @@ } public void testFeedRead() throws Exception { - List<SyndicatedEntryModel> feed = SyndicationUtils.readFeed("https://localhost:8443", - "ticgit.git", "master", 5, "admin", "admin".toCharArray()); + Set<String> links = new HashSet<String>(); + for (int i = 0; i < 2; i++) { + List<FeedEntryModel> feed = SyndicationUtils.readFeed(GitBlitSuite.url, + "ticgit.git", "master", 5, i, GitBlitSuite.account, + GitBlitSuite.password.toCharArray()); + assertTrue(feed != null); + assertTrue(feed.size() > 0); + assertEquals(5, feed.size()); + for (FeedEntryModel entry : feed) { + links.add(entry.link); + } + } + // confirm we have 10 unique commits + assertEquals("Feed pagination failed", 10, links.size()); + } + + public void testSearchFeedRead() throws Exception { + List<FeedEntryModel> feed = SyndicationUtils.readSearchFeed(GitBlitSuite.url, + "ticgit.git", null, "test", null, 5, 0, GitBlitSuite.account, + GitBlitSuite.password.toCharArray()); + assertTrue(feed != null); + assertTrue(feed.size() > 0); + assertEquals(5, feed.size()); + feed = SyndicationUtils.readSearchFeed(GitBlitSuite.url, "ticgit.git", "master", "test", + SearchType.COMMIT, 5, 1, GitBlitSuite.account, GitBlitSuite.password.toCharArray()); assertTrue(feed != null); assertTrue(feed.size() > 0); assertEquals(5, feed.size()); -- Gitblit v1.9.1