Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/services
In directory
james.mmbase.org:/tmp/cvs-serv11899/portlets-newsletter/src/test/com/finalist/newsletter/services
Modified Files:
StatisticServiceTest.java
NewsletterPublicationServiceTest.java
Log Message:
CMSC-725 service classes,some class refactory.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/services
See also: http://www.mmbase.org/jira/browse/CMSC-725
Index: StatisticServiceTest.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/services/StatisticServiceTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- StatisticServiceTest.java 10 Apr 2008 10:07:47 -0000 1.2
+++ StatisticServiceTest.java 15 Apr 2008 06:18:33 -0000 1.3
@@ -31,6 +31,7 @@
assertEquals("newsletter.summary", result.getName());
}
+
// public List<StatisticResult> statisticAll();
// public List<StatisticResult> statisticByNewsletter(int newsletterId);
// public List<StatisticResult> statisticAllByPeriod(String start,String
end);
Index: NewsletterPublicationServiceTest.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/test/com/finalist/newsletter/services/NewsletterPublicationServiceTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewsletterPublicationServiceTest.java 11 Apr 2008 07:11:25 -0000
1.2
+++ NewsletterPublicationServiceTest.java 15 Apr 2008 06:18:33 -0000
1.3
@@ -1,12 +1,11 @@
package com.finalist.newsletter.services;
-import com.finalist.cmsc.services.community.person.Person;
+import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
import com.finalist.newsletter.cao.NewsletterPublicationCAO;
import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
-import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
+import com.finalist.newsletter.cao.impl.NewsLetterStatisticCAOImpl;
import com.finalist.newsletter.cao.impl.NewsletterPublicationCAOImpl;
import com.finalist.newsletter.cao.impl.NewsletterSubscriptionCAOImpl;
-import com.finalist.newsletter.cao.impl.NewsLetterStatisticCAOImpl;
import com.finalist.newsletter.domain.Publication;
import com.finalist.newsletter.domain.Subscription;
import com.finalist.newsletter.publisher.FakeNewsletterPublisher;
@@ -43,7 +42,6 @@
}
});
-
mockController.expect(new NewsletterSubscriptionCAOImpl() {
public List<Subscription> getSubscribers(int newsletterId) {
assertEquals(1, newsletterId);
@@ -68,41 +66,29 @@
}
});
-
mockController.expect(new NewsletterSubscriptionCAOImpl() {
public List<Subscription> getSubscribers(int newsletterId) {
assertEquals(3, newsletterId);
Subscription subscriptioin = new Subscription();
return Collections.singletonList(subscriptioin);
}
- }
-
- );
-
- mockController.expect(new
+ });
- NewsLetterStatisticCAOImpl() {
+ mockController.expect(new NewsLetterStatisticCAOImpl() {
public void logPubliction(int id, int i) {
assertEquals(3, id);
assertEquals(1, i);
}
+ });
- }
-
- );
- mockController.expect(new
-
- NewsletterPublicationCAOImpl() {
+ mockController.expect(new NewsletterPublicationCAOImpl() {
public void setStatus(Publication publication,
Publication.STATUS status) {
assertNotNull(publication);
assertEquals(3, publication.getId());
assertNotNull(status);
assertEquals(status, Publication.STATUS.DELIVERED);
}
- }
-
- );
-
+ });
service.setPublicationCAO(publicationCAO);
service.setSubscriptionCAO(subscriptionCAO);
@@ -113,41 +99,9 @@
mockController.verify();
- assertEquals(2, publisher.getMap()
-
- .
-
- keySet()
-
- .
-
- size()
-
- );
-
- assertEquals(1, publisher.getMap()
-
- .
-
- get(1)
-
- .
-
- size()
-
- );
-
- assertEquals(1, publisher.getMap()
-
- .
-
- get(3)
-
- .
-
- size()
-
- );
+ assertEquals(2, publisher.getMap().keySet().size());
+ assertEquals(1, publisher.getMap().get(1).size());
+ assertEquals(1, publisher.getMap().get(3).size());
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
