[jboss-cvs] JBossBlog SVN: r143 - in trunk/src: action/org/jboss/blog/session/merge and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 28 17:00:11 EST 2007
Author: adamw
Date: 2007-11-28 17:00:09 -0500 (Wed, 28 Nov 2007)
New Revision: 143
Modified:
trunk/src/action/org/jboss/blog/session/feed/remote/RemoteFeedUpdateBean.java
trunk/src/action/org/jboss/blog/session/merge/FeedsServicePostsIterator.java
trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java
trunk/src/test/org/jboss/blog/session/merge/test/MergeServiceTest.java
Log:
Modified: trunk/src/action/org/jboss/blog/session/feed/remote/RemoteFeedUpdateBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/feed/remote/RemoteFeedUpdateBean.java 2007-11-28 20:53:08 UTC (rev 142)
+++ trunk/src/action/org/jboss/blog/session/feed/remote/RemoteFeedUpdateBean.java 2007-11-28 22:00:09 UTC (rev 143)
@@ -26,8 +26,6 @@
private MergeServiceBean mergeService;
public void update(Feed feed) throws UpdateException {
- System.out.println("Updating " + feed.getName());
-
if (!(feed instanceof RemoteFeed)) {
throw new InvalidFeedTypeException();
}
Modified: trunk/src/action/org/jboss/blog/session/merge/FeedsServicePostsIterator.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/merge/FeedsServicePostsIterator.java 2007-11-28 20:53:08 UTC (rev 142)
+++ trunk/src/action/org/jboss/blog/session/merge/FeedsServicePostsIterator.java 2007-11-28 22:00:09 UTC (rev 143)
@@ -38,7 +38,7 @@
}
private void readNextChunk() {
- List<Post> posts = feedsService.getPosts(feed, nextFrom, nextFrom+chunkSize-1);
+ List<Post> posts = feedsService.getPosts(feed, nextFrom, nextFrom+chunkSize);
iterator = posts.iterator();
lastChunkSize = posts.size();
nextFrom += chunkSize;
Modified: trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java 2007-11-28 20:53:08 UTC (rev 142)
+++ trunk/src/action/org/jboss/blog/session/merge/MergeServiceBean.java 2007-11-28 22:00:09 UTC (rev 143)
@@ -5,10 +5,8 @@
import org.jboss.blog.service.FeedsService;
import org.jboss.blog.tools.GeneralTools;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.AutoCreate;
-import org.jboss.seam.annotations.In;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.annotations.*;
+import org.jboss.seam.log.Log;
import javax.persistence.EntityManager;
import java.util.List;
@@ -26,7 +24,12 @@
@In
private EntityManager entityManager;
+ @Logger
+ private Log log;
+
private void savePost(Feed feed, Post post) {
+ log.debug("Saving post, feed: #0, post title: #1, post titleAsId: #2, published: #3.",
+ feed.getName(), post.getTitle(), post.getTitleAsId());
post.setFeed(feed);
entityManager.persist(post);
}
Modified: trunk/src/test/org/jboss/blog/session/merge/test/MergeServiceTest.java
===================================================================
--- trunk/src/test/org/jboss/blog/session/merge/test/MergeServiceTest.java 2007-11-28 20:53:08 UTC (rev 142)
+++ trunk/src/test/org/jboss/blog/session/merge/test/MergeServiceTest.java 2007-11-28 22:00:09 UTC (rev 143)
@@ -89,7 +89,7 @@
post_2007_11_01_t1_c1_l1);
// Behaviour of mocks
- expect(mockFeedsService.getPosts((Feed) null, 0, 2)).andReturn(posts);
+ expect(mockFeedsService.getPosts((Feed) null, 0, 3)).andReturn(posts);
mockEntityManager.flush();
// Test
@@ -109,7 +109,7 @@
post_2007_11_01_t1_c1_l1);
// Behaviour of mocks
- expect(mockFeedsService.getPosts((Feed) null, 0, 2)).andReturn(mergeTo);
+ expect(mockFeedsService.getPosts((Feed) null, 0, 3)).andReturn(mergeTo);
mockEntityManager.persist(post_2007_11_02_t3_c3_l3);
mockEntityManager.persist(post_2007_11_01_t1_c1_l1);
mockEntityManager.flush();
@@ -131,7 +131,7 @@
List<Post> mergeFrom = new ArrayList<Post>();
// Behaviour of mocks
- expect(mockFeedsService.getPosts((Feed) null, 0, 0)).andReturn(mergeTo);
+ expect(mockFeedsService.getPosts((Feed) null, 0, 1)).andReturn(mergeTo);
mockEntityManager.flush();
// Test
@@ -152,7 +152,7 @@
post_2007_11_02_t1_c1_l4);
// Behaviour of mocks
- expect(mockFeedsService.getPosts((Feed) null, 0, 2)).andReturn(mergeTo);
+ expect(mockFeedsService.getPosts((Feed) null, 0, 3)).andReturn(mergeTo);
mockEntityManager.persist(post_2007_11_04_t6_c6_l7);
mockEntityManager.persist(post_2007_11_02_t1_c1_l4);
mockEntityManager.flush();
@@ -176,9 +176,9 @@
post_2007_11_03_t5_c5_l6, post_2007_11_01_t2_c2_l2);
// Behaviour of mocks
- expect(mockFeedsService.getPosts((Feed) null, 0, 3)).andReturn(mergeTo);
+ expect(mockFeedsService.getPosts((Feed) null, 0, 4)).andReturn(mergeTo);
mockEntityManager.persist(post_2007_11_03_t5_c5_l6);
- expect(mockFeedsService.getPosts((Feed) null, 4, 7)).andReturn(new ArrayList<Post>());
+ expect(mockFeedsService.getPosts((Feed) null, 4, 8)).andReturn(new ArrayList<Post>());
mockEntityManager.persist(post_2007_11_01_t2_c2_l2);
mockEntityManager.flush();
@@ -202,7 +202,7 @@
post_2007_11_03_t4_c4_l5, post_2007_11_02_t3_c3_l3);
// Behaviour of mocks
- expect(mockFeedsService.getPosts((Feed) null, 0, 5)).andReturn(mergeTo);
+ expect(mockFeedsService.getPosts((Feed) null, 0, 6)).andReturn(mergeTo);
mockEntityManager.flush();
// Test
@@ -225,9 +225,9 @@
List<Post> mergeFrom = Arrays.asList(post_2007_11_02_t1_c1_l4);
// Behaviour of mocks
- expect(mockFeedsService.getPosts((Feed) null, 0, 1)).andReturn(mergeTo1);
- expect(mockFeedsService.getPosts((Feed) null, 2, 3)).andReturn(mergeTo2);
- expect(mockFeedsService.getPosts((Feed) null, 4, 5)).andReturn(mergeTo3);
+ expect(mockFeedsService.getPosts((Feed) null, 0, 2)).andReturn(mergeTo1);
+ expect(mockFeedsService.getPosts((Feed) null, 2, 4)).andReturn(mergeTo2);
+ expect(mockFeedsService.getPosts((Feed) null, 4, 6)).andReturn(mergeTo3);
mockEntityManager.persist(post_2007_11_02_t1_c1_l4);
mockEntityManager.flush();
More information about the jboss-cvs-commits
mailing list