Repository: roller Updated Branches: refs/heads/master 1feee3632 -> 96e845ad3
Test fixes due to changes on rollerweblogger.org and cassandra.apache.org Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/96e845ad Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/96e845ad Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/96e845ad Branch: refs/heads/master Commit: 96e845ad3131a76b671896c01c4742b874d4f3ed Parents: 1feee36 Author: Dave Johnson <[email protected]> Authored: Thu Jan 12 16:51:46 2017 -0500 Committer: Dave Johnson <[email protected]> Committed: Thu Jan 12 16:51:46 2017 -0500 ---------------------------------------------------------------------- .gitignore | 1 + app/src/main/resources/sql/db2/.gitkeep | 0 app/src/main/resources/sql/derby/.gitkeep | 0 app/src/main/resources/sql/hsqldb/.gitkeep | 0 app/src/main/resources/sql/mssql/.gitkeep | 0 app/src/main/resources/sql/mysql/.gitkeep | 0 app/src/main/resources/sql/oracle/.gitkeep | 0 app/src/main/resources/sql/postgresql/.gitkeep | 0 .../org/apache/roller/planet/business/RomeFeedFetcherTest.java | 4 ++-- .../roller/planet/business/SingleThreadedFeedUpdaterTest.java | 2 +- .../org/apache/roller/weblogger/util/LinkbackExtractorTest.java | 2 +- 11 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/96e845ad/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bfa6a22 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +# Created by .ignore support plugin (hsz.mobi) http://git-wip-us.apache.org/repos/asf/roller/blob/96e845ad/app/src/main/resources/sql/db2/.gitkeep ---------------------------------------------------------------------- diff --git a/app/src/main/resources/sql/db2/.gitkeep b/app/src/main/resources/sql/db2/.gitkeep new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/roller/blob/96e845ad/app/src/main/resources/sql/derby/.gitkeep ---------------------------------------------------------------------- diff --git a/app/src/main/resources/sql/derby/.gitkeep b/app/src/main/resources/sql/derby/.gitkeep new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/roller/blob/96e845ad/app/src/main/resources/sql/hsqldb/.gitkeep ---------------------------------------------------------------------- diff --git a/app/src/main/resources/sql/hsqldb/.gitkeep b/app/src/main/resources/sql/hsqldb/.gitkeep new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/roller/blob/96e845ad/app/src/main/resources/sql/mssql/.gitkeep ---------------------------------------------------------------------- diff --git a/app/src/main/resources/sql/mssql/.gitkeep b/app/src/main/resources/sql/mssql/.gitkeep new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/roller/blob/96e845ad/app/src/main/resources/sql/mysql/.gitkeep ---------------------------------------------------------------------- diff --git a/app/src/main/resources/sql/mysql/.gitkeep b/app/src/main/resources/sql/mysql/.gitkeep new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/roller/blob/96e845ad/app/src/main/resources/sql/oracle/.gitkeep ---------------------------------------------------------------------- diff --git a/app/src/main/resources/sql/oracle/.gitkeep b/app/src/main/resources/sql/oracle/.gitkeep new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/roller/blob/96e845ad/app/src/main/resources/sql/postgresql/.gitkeep ---------------------------------------------------------------------- diff --git a/app/src/main/resources/sql/postgresql/.gitkeep b/app/src/main/resources/sql/postgresql/.gitkeep new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/roller/blob/96e845ad/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java ---------------------------------------------------------------------- diff --git a/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java b/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java index b34d57f..4cf3b24 100644 --- a/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java +++ b/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java @@ -56,7 +56,7 @@ public class RomeFeedFetcherTest extends TestCase { Subscription sub = feedFetcher.fetchSubscription(feed_url); assertNotNull(sub); assertEquals(feed_url, sub.getFeedURL()); - assertEquals("https://rollerweblogger.org/roller/";, sub.getSiteURL()); + assertEquals("http://rollerweblogger.org/roller/";, sub.getSiteURL()); assertEquals("Blogging Roller", sub.getTitle()); assertNotNull(sub.getLastUpdated()); assertTrue(sub.getEntries().size() > 0); @@ -76,7 +76,7 @@ public class RomeFeedFetcherTest extends TestCase { Subscription sub = feedFetcher.fetchSubscription(feed_url); assertNotNull(sub); assertEquals(feed_url, sub.getFeedURL()); - assertEquals("https://rollerweblogger.org/roller/";, sub.getSiteURL()); + assertEquals("http://rollerweblogger.org/roller/";, sub.getSiteURL()); assertEquals("Blogging Roller", sub.getTitle()); assertNotNull(sub.getLastUpdated()); assertTrue(sub.getEntries().size() > 0); http://git-wip-us.apache.org/repos/asf/roller/blob/96e845ad/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java ---------------------------------------------------------------------- diff --git a/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java b/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java index dc0692a..46298c5 100644 --- a/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java +++ b/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java @@ -71,7 +71,7 @@ public class SingleThreadedFeedUpdaterTest extends TestCase { sub = mgr.getSubscription(feed_url); assertNotNull(sub); assertEquals(feed_url, sub.getFeedURL()); - assertEquals("https://rollerweblogger.org/roller/";, sub.getSiteURL()); + assertEquals("http://rollerweblogger.org/roller/";, sub.getSiteURL()); assertEquals("Blogging Roller", sub.getTitle()); assertNotNull(sub.getLastUpdated()); assertTrue(sub.getEntries().size() > 0); http://git-wip-us.apache.org/repos/asf/roller/blob/96e845ad/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java ---------------------------------------------------------------------- diff --git a/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java b/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java index 005a455..0361c2c 100644 --- a/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java @@ -67,7 +67,7 @@ public class LinkbackExtractorTest extends TestCase { }; LinkbackExtractor le = new LinkbackExtractor(testrefs[0][0],testrefs[0][1]); - assertEquals("The Apache Cassandra Project", le.getTitle()); + assertEquals("Apache Cassandra", le.getTitle()); le = new LinkbackExtractor(testrefs[1][0],testrefs[1][1]); assertEquals("Apache Roller", le.getTitle());
