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/SyndicationUtilsTest.java | 41 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/gitblit/tests/SyndicationUtilsTest.java b/src/test/java/com/gitblit/tests/SyndicationUtilsTest.java index 66d0c3a..b4bb044 100644 --- a/src/test/java/com/gitblit/tests/SyndicationUtilsTest.java +++ b/src/test/java/com/gitblit/tests/SyndicationUtilsTest.java @@ -15,23 +15,37 @@ */ package com.gitblit.tests; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - 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 java.util.concurrent.atomic.AtomicBoolean; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import com.gitblit.Constants.SearchType; import com.gitblit.models.FeedEntryModel; import com.gitblit.utils.SyndicationUtils; -public class SyndicationUtilsTest { +public class SyndicationUtilsTest extends GitblitUnitTest { + + private static final AtomicBoolean started = new AtomicBoolean(false); + + @BeforeClass + public static void startGitblit() throws Exception { + started.set(GitBlitSuite.startGitblit()); + } + + @AfterClass + public static void stopGitblit() throws Exception { + if (started.get()) { + GitBlitSuite.stopGitblit(); + } + } @Test public void testSyndication() throws Exception { @@ -63,7 +77,7 @@ } @Test - public void testFeedRead() throws Exception { + public void testFeedReadCommits() throws Exception { Set<String> links = new HashSet<String>(); for (int i = 0; i < 2; i++) { List<FeedEntryModel> feed = SyndicationUtils.readFeed(GitBlitSuite.url, "ticgit.git", @@ -80,6 +94,23 @@ } @Test + public void testFeedReadTags() throws Exception { + Set<String> links = new HashSet<String>(); + for (int i = 0; i < 2; i++) { + List<FeedEntryModel> feed = SyndicationUtils.readTags(GitBlitSuite.url, "test/gitective.git", + 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 tags + assertEquals("Feed pagination failed", 10, links.size()); + } + + @Test public void testSearchFeedRead() throws Exception { List<FeedEntryModel> feed = SyndicationUtils .readSearchFeed(GitBlitSuite.url, "ticgit.git", null, "test", null, 5, 0, -- Gitblit v1.9.1