From 78dc06a87f82ed19e3eebe1f16dc6c1bdaf5fbc5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 31 Jan 2012 09:35:30 -0500
Subject: [PATCH] Merge pull request #6 from lemval/master
---
tests/com/gitblit/tests/SyndicationUtilsTest.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/tests/com/gitblit/tests/SyndicationUtilsTest.java b/tests/com/gitblit/tests/SyndicationUtilsTest.java
index 448874f..ca6678d 100644
--- a/tests/com/gitblit/tests/SyndicationUtilsTest.java
+++ b/tests/com/gitblit/tests/SyndicationUtilsTest.java
@@ -15,6 +15,9 @@
*/
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;
@@ -22,14 +25,15 @@
import java.util.List;
import java.util.Set;
-import junit.framework.TestCase;
+import org.junit.Test;
import com.gitblit.Constants.SearchType;
import com.gitblit.models.FeedEntryModel;
import com.gitblit.utils.SyndicationUtils;
-public class SyndicationUtilsTest extends TestCase {
+public class SyndicationUtilsTest {
+ @Test
public void testSyndication() throws Exception {
List<FeedEntryModel> entries = new ArrayList<FeedEntryModel>();
for (int i = 0; i < 10; i++) {
@@ -58,12 +62,12 @@
assertTrue(feed.indexOf("<description>Description</description>") > -1);
}
+ @Test
public void testFeedRead() throws Exception {
Set<String> links = new HashSet<String>();
for (int i = 0; i < 2; i++) {
- List<FeedEntryModel> feed = SyndicationUtils.readFeed(GitBlitSuite.url,
- "ticgit.git", "deving", 5, i, GitBlitSuite.account,
- GitBlitSuite.password.toCharArray());
+ List<FeedEntryModel> feed = SyndicationUtils.readFeed(GitBlitSuite.url, "ticgit.git",
+ "deving", 5, i, GitBlitSuite.account, GitBlitSuite.password.toCharArray());
assertTrue(feed != null);
assertTrue(feed.size() > 0);
assertEquals(5, feed.size());
@@ -75,10 +79,11 @@
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, GitBlitSuite.account,
- GitBlitSuite.password.toCharArray());
+ 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());
--
Gitblit v1.9.1