[jboss-cvs] JBossBlog SVN: r233 - in trunk: src/action/org/jboss/blog/session/tools and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Mar 1 12:48:47 EST 2008
Author: adamw
Date: 2008-03-01 12:48:47 -0500 (Sat, 01 Mar 2008)
New Revision: 233
Added:
trunk/src/test/org/jboss/blog/session/merge/test/MockEvents.java
trunk/src/test/org/jboss/blog/session/merge/test/MockTitleAsIdService.java
Modified:
trunk/resources/WEB-INF/components.xml
trunk/src/action/org/jboss/blog/session/tools/StringToolsBean.java
trunk/src/test/org/jboss/blog/session/merge/test/MergeServiceTest.java
trunk/src/test/org/jboss/blog/tools/FixHtmlTest.java
Log:
Modified: trunk/resources/WEB-INF/components.xml
===================================================================
--- trunk/resources/WEB-INF/components.xml 2008-03-01 16:36:20 UTC (rev 232)
+++ trunk/resources/WEB-INF/components.xml 2008-03-01 17:48:47 UTC (rev 233)
@@ -70,4 +70,8 @@
<property name="serverAddress">http://localhost:8080</property>
<property name="contextName">blogs</property>
</component>
+
+ <component name="stringTools">
+ <property name="summaryLength">1000</property>
+ </component>
</components>
Modified: trunk/src/action/org/jboss/blog/session/tools/StringToolsBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/tools/StringToolsBean.java 2008-03-01 16:36:20 UTC (rev 232)
+++ trunk/src/action/org/jboss/blog/session/tools/StringToolsBean.java 2008-03-01 17:48:47 UTC (rev 233)
@@ -13,7 +13,17 @@
@Scope(ScopeType.APPLICATION)
@AutoCreate
public class StringToolsBean {
+ private volatile int summaryLength;
+
+ public int getSummaryLength() {
+ return summaryLength;
+ }
+
+ public void setSummaryLength(int summaryLength) {
+ this.summaryLength = summaryLength;
+ }
+
public String createSummary(String s) {
- return StringTools.createSummary(s, 1000);
+ return StringTools.createSummary(s, summaryLength);
}
}
Modified: trunk/src/test/org/jboss/blog/session/merge/test/MergeServiceTest.java
===================================================================
--- trunk/src/test/org/jboss/blog/session/merge/test/MergeServiceTest.java 2008-03-01 16:36:20 UTC (rev 232)
+++ trunk/src/test/org/jboss/blog/session/merge/test/MergeServiceTest.java 2008-03-01 17:48:47 UTC (rev 233)
@@ -6,6 +6,7 @@
import org.jboss.blog.model.Enclosure;
import org.jboss.blog.model.Image;
import org.jboss.blog.service.FeedsService;
+import org.jboss.blog.service.PostNotFoundException;
import org.jboss.blog.session.merge.MergeServiceBean;
import org.jboss.blog.session.merge.TitleAsIdService;
import org.jboss.blog.tools.TestTools;
@@ -41,6 +42,7 @@
private Post createPost(Date published, String title, String content, String link) {
Post post = new Post();
post.setPublished(published);
+ post.setModified(published);
post.setTitle(title);
post.setContent(content);
post.setLink(link);
@@ -83,22 +85,24 @@
mockFeedsService = createMock(FeedsService.class);
TestTools.setField(mergeServiceBean, "feedsService", mockFeedsService);
- TitleAsIdService mockTitleAsIdService = createMock(TitleAsIdService.class);
- TestTools.setField(mergeServiceBean, "titleAsIdService", mockTitleAsIdService);
+ TestTools.setField(mergeServiceBean, "titleAsIdService", new MockTitleAsIdService());
- Log mockLog = createMock(Log.class);
- TestTools.setField(mergeServiceBean, "log", mockLog);
+ TestTools.setField(mergeServiceBean, "log", createMock(Log.class));
+ TestTools.setField(mergeServiceBean, "events", new MockEvents());
+
feed = new Feed();
}
@Test
- public void testMergeIdentical() throws IllegalAccessException, NoSuchFieldException {
+ public void testMergeIdentical() throws IllegalAccessException, NoSuchFieldException, PostNotFoundException {
List<Post> posts = Arrays.asList(post_2007_11_02_t3_c3_l3,
post_2007_11_01_t1_c1_l1);
// Behaviour of mocks
expect(mockFeedsService.getPosts(feed, 0, 3)).andReturn((List) posts);
+ expect(mockFeedsService.getPost(post_2007_11_02_t3_c3_l3.getTitle())).andReturn(post_2007_11_02_t3_c3_l3);
+ expect(mockFeedsService.getPost(post_2007_11_01_t1_c1_l1.getTitle())).andReturn(post_2007_11_01_t1_c1_l1);
mockEntityManager.flush();
// Test
@@ -120,8 +124,10 @@
// Behaviour of mocks
expect(mockFeedsService.getPosts(feed, 0, 3)).andReturn((List) mergeTo);
mockEntityManager.persist(post_2007_11_02_t3_c3_l3);
+ mockEntityManager.flush();
mockEntityManager.persist(post_2007_11_01_t1_c1_l1);
mockEntityManager.flush();
+ mockEntityManager.flush();
// Test
replay(mockEntityManager);
@@ -163,8 +169,10 @@
// Behaviour of mocks
expect(mockFeedsService.getPosts(feed, 0, 3)).andReturn((List) mergeTo);
mockEntityManager.persist(post_2007_11_04_t6_c6_l7);
+ mockEntityManager.flush();
mockEntityManager.persist(post_2007_11_02_t1_c1_l4);
mockEntityManager.flush();
+ mockEntityManager.flush();
// Test
replay(mockEntityManager);
@@ -177,7 +185,7 @@
}
@Test
- public void testMergeInterleaving_WithIntersection() throws IllegalAccessException, NoSuchFieldException {
+ public void testMergeInterleaving_WithIntersection() throws IllegalAccessException, NoSuchFieldException, PostNotFoundException {
List<Post> mergeTo = Arrays.asList(post_2007_11_05_t6_c6_l8,
post_2007_11_04_t6_c6_l7, post_2007_11_02_t1_c1_l4,
post_2007_11_01_t1_c1_l1);
@@ -186,9 +194,17 @@
// Behaviour of mocks
expect(mockFeedsService.getPosts(feed, 0, 4)).andReturn((List) mergeTo);
+
+ expect(mockFeedsService.getPost(post_2007_11_04_t6_c6_l7.getTitle())).andReturn(post_2007_11_04_t6_c6_l7);
+
mockEntityManager.persist(post_2007_11_03_t5_c5_l6);
+ mockEntityManager.flush();
+
+ expect(mockFeedsService.getPost(post_2007_11_01_t1_c1_l1.getTitle())).andReturn(post_2007_11_01_t1_c1_l1);
+ mockEntityManager.flush();
+
expect(mockFeedsService.getPosts(feed, 4, 8)).andReturn(new ArrayList());
- mockEntityManager.persist(post_2007_11_01_t2_c2_l2);
+
mockEntityManager.flush();
// Test
@@ -197,12 +213,16 @@
mergeServiceBean.merge(feed, mergeFrom);
+ assert "title2".equals(mergeTo.get(3).getTitle());
+ assert "content2".equals(mergeTo.get(3).getContent());
+ assert "link2".equals(mergeTo.get(3).getLink());
+
verify(mockEntityManager);
verify(mockFeedsService);
}
@Test
- public void testMergeChangedPost() throws IllegalAccessException, NoSuchFieldException {
+ public void testMergeChangedPost() throws IllegalAccessException, NoSuchFieldException, PostNotFoundException {
List<Post> mergeTo = Arrays.asList(post_2007_11_05_t6_c6_l8,
post_2007_11_04_t6_c6_l7, post_2007_11_03_t5_c5_l6,
post_2007_11_03_t4_c4_l5, post_2007_11_02_t3_c3_l3);
@@ -212,7 +232,13 @@
// Behaviour of mocks
expect(mockFeedsService.getPosts(feed, 0, 6)).andReturn((List) mergeTo);
+ expect(mockFeedsService.getPost(post_2007_11_05_t6_c6_l8.getTitle())).andReturn(post_2007_11_05_t6_c6_l8);
+ expect(mockFeedsService.getPost(post_2007_11_04_t6_c6_l7.getTitle())).andReturn(post_2007_11_04_t6_c6_l7);
+ expect(mockFeedsService.getPost(post_2007_11_03_t5_c5_l6.getTitle())).andReturn(post_2007_11_03_t5_c5_l6);
+ expect(mockFeedsService.getPost(post_2007_11_03_t4_c4_l5.getTitle())).andReturn(post_2007_11_03_t4_c4_l5);
+ expect(mockFeedsService.getPost(post_2007_11_02_t3_c3_l3.getTitle())).andReturn(post_2007_11_02_t3_c3_l3);
mockEntityManager.flush();
+ mockEntityManager.flush();
// Test
replay(mockEntityManager);
@@ -239,6 +265,7 @@
expect(mockFeedsService.getPosts(feed, 4, 6)).andReturn((List) mergeTo3);
mockEntityManager.persist(post_2007_11_02_t1_c1_l4);
mockEntityManager.flush();
+ mockEntityManager.flush();
// Test
replay(mockEntityManager);
Added: trunk/src/test/org/jboss/blog/session/merge/test/MockEvents.java
===================================================================
--- trunk/src/test/org/jboss/blog/session/merge/test/MockEvents.java (rev 0)
+++ trunk/src/test/org/jboss/blog/session/merge/test/MockEvents.java 2008-03-01 17:48:47 UTC (rev 233)
@@ -0,0 +1,12 @@
+package org.jboss.blog.session.merge.test;
+
+import org.jboss.seam.core.Events;
+
+/**
+ * @author <a href="mailto:adam at warski.org">Adam Warski</a>
+ */
+public class MockEvents extends Events {
+ public void raiseEvent(String s, Object... objects) {
+
+ }
+}
Added: trunk/src/test/org/jboss/blog/session/merge/test/MockTitleAsIdService.java
===================================================================
--- trunk/src/test/org/jboss/blog/session/merge/test/MockTitleAsIdService.java (rev 0)
+++ trunk/src/test/org/jboss/blog/session/merge/test/MockTitleAsIdService.java 2008-03-01 17:48:47 UTC (rev 233)
@@ -0,0 +1,13 @@
+package org.jboss.blog.session.merge.test;
+
+import org.jboss.blog.session.merge.TitleAsIdService;
+import org.jboss.blog.tools.StringTools;
+
+/**
+ * @author <a href="mailto:adam at warski.org">Adam Warski</a>
+ */
+public class MockTitleAsIdService implements TitleAsIdService {
+ public String generateTitleAsId(String title) {
+ return StringTools.convertTitleToLink(title);
+ }
+}
Modified: trunk/src/test/org/jboss/blog/tools/FixHtmlTest.java
===================================================================
--- trunk/src/test/org/jboss/blog/tools/FixHtmlTest.java 2008-03-01 16:36:20 UTC (rev 232)
+++ trunk/src/test/org/jboss/blog/tools/FixHtmlTest.java 2008-03-01 17:48:47 UTC (rev 233)
@@ -10,11 +10,11 @@
@DataProvider(name = "texts")
public Object[][] getData() {
return new Object[][] {
- { "<p>Some text.</p>", "<div><p>Some text.</p>\n</div>" },
- { "<p><i>Some text.</i></p>", "<div><p><i>Some text.</i>\n</p>\n</div>" },
- { "Some text.", "<div>Some text.</div>" },
- { "<p>Some text.", "<div><p>Some text.</p>\n</div>" },
- { "Some text.</p>", "<div>Some text.</div>" }
+ { "<p>Some text.</p>", "<p>Some text.</p>\n" },
+ { "<p><i>Some text.</i></p>", "<p><i>Some text.</i>\n</p>\n" },
+ { "Some text.", "Some text." },
+ { "<p>Some text.", "<p>Some text.</p>\n" },
+ { "Some text.</p>", "Some text." }
};
}
More information about the jboss-cvs-commits
mailing list