[jboss-cvs] jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin ...
Christian Bauer
christian at hibernate.org
Thu Jan 10 03:37:45 EST 2008
User: cbauer
Date: 08/01/10 03:37:45
Modified: examples/wiki/src/test/org/jboss/seam/wiki/test/plugin
ForumHomeTests.java TopicHomeTests.java
ForumQueryTests.java BlogDAOTests.java
ForumDAOTests.java
Log:
Better getInstance() calls
Revision Changes Path
1.2 +5 -5 jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/ForumHomeTests.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ForumHomeTests.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/ForumHomeTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ForumHomeTests.java 19 Dec 2007 04:29:27 -0000 1.1
+++ ForumHomeTests.java 10 Jan 2008 08:37:45 -0000 1.2
@@ -35,13 +35,13 @@
final String conversationId = new FacesRequest() {
protected void updateModelValues() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forumDir = nodeDAO.findWikiDirectory(100l);
Contexts.getPageContext().set("currentDirectory", forumDir);
}
protected void invokeApplication() throws Exception {
- ForumHome home = (ForumHome)getInstance("forumHome");
+ ForumHome home = (ForumHome)getInstance(ForumHome.class);
home.newForum();
}
}.run();
@@ -53,13 +53,13 @@
}
protected void updateModelValues() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forumDir = nodeDAO.findWikiDirectory(100l);
Contexts.getPageContext().set("currentDirectory", forumDir);
}
protected void invokeApplication() throws Exception {
- ForumHome home = (ForumHome)getInstance("forumHome");
+ ForumHome home = (ForumHome)getInstance(ForumHome.class);
home.getInstance().setName("New Forum");
home.getInstance().setDescription("This is a new forum");
@@ -70,7 +70,7 @@
protected void renderResponse() throws Exception {
Long newId = (Long)getValue("#{forumHome.instance.id}");
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory newForum = nodeDAO.findWikiDirectory(newId);
assert newForum.getAreaNumber().equals(100l);
1.3 +18 -18 jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/TopicHomeTests.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TopicHomeTests.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/TopicHomeTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- TopicHomeTests.java 4 Jan 2008 22:28:52 -0000 1.2
+++ TopicHomeTests.java 10 Jan 2008 08:37:45 -0000 1.3
@@ -35,13 +35,13 @@
final String conversationId = new FacesRequest() {
protected void updateModelValues() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forumDir = nodeDAO.findWikiDirectory(102l);
Contexts.getPageContext().set("currentDirectory", forumDir);
}
protected void invokeApplication() throws Exception {
- TopicHome home = (TopicHome)getInstance("topicHome");
+ TopicHome home = (TopicHome)getInstance(TopicHome.class);
home.newTopic();
}
}.run();
@@ -53,13 +53,13 @@
}
protected void updateModelValues() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forumDir = nodeDAO.findWikiDirectory(102l);
Contexts.getPageContext().set("currentDirectory", forumDir);
}
protected void invokeApplication() throws Exception {
- TopicHome home = (TopicHome)getInstance("topicHome");
+ TopicHome home = (TopicHome)getInstance(TopicHome.class);
home.getInstance().setName("New Topic");
home.setFormContent("This is a new topic.");
@@ -70,12 +70,12 @@
protected void renderResponse() throws Exception {
Long newId = (Long)getValue("#{topicHome.instance.id}");
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDocument newTopic = nodeDAO.findWikiDocument(newId);
assert newTopic.getAreaNumber().equals(100l);
- FeedDAO feedDAO = (FeedDAO)getInstance("feedDAO");
+ FeedDAO feedDAO = (FeedDAO)getInstance(FeedDAO.class);
FeedEntry fe = feedDAO.findFeedEntry(newTopic);
assert fe.getTitle().equals("[Seam Users] New Topic");
@@ -100,13 +100,13 @@
final String conversationId = new FacesRequest() {
protected void updateModelValues() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forumDir = nodeDAO.findWikiDirectory(102l);
Contexts.getPageContext().set("currentDirectory", forumDir);
}
protected void invokeApplication() throws Exception {
- TopicHome home = (TopicHome)getInstance("topicHome");
+ TopicHome home = (TopicHome)getInstance(TopicHome.class);
home.newTopic();
}
}.run();
@@ -118,13 +118,13 @@
}
protected void updateModelValues() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forumDir = nodeDAO.findWikiDirectory(102l);
Contexts.getPageContext().set("currentDirectory", forumDir);
}
protected void invokeApplication() throws Exception {
- TopicHome home = (TopicHome)getInstance("topicHome");
+ TopicHome home = (TopicHome)getInstance(TopicHome.class);
home.getInstance().setName("New Topic");
home.setFormContent("This is a new topic.");
@@ -136,12 +136,12 @@
protected void renderResponse() throws Exception {
Long newId = (Long)getValue("#{topicHome.instance.id}");
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDocument newTopic = nodeDAO.findWikiDocument(newId);
assert newTopic.getAreaNumber().equals(100l);
- FeedDAO feedDAO = (FeedDAO)getInstance("feedDAO");
+ FeedDAO feedDAO = (FeedDAO)getInstance(FeedDAO.class);
FeedEntry fe = feedDAO.findFeedEntry(newTopic);
assert fe.getTitle().equals("[Seam Users] New Topic");
@@ -164,13 +164,13 @@
final String conversationId = new FacesRequest() {
protected void updateModelValues() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forumDir = nodeDAO.findWikiDirectory(102l);
Contexts.getPageContext().set("currentDirectory", forumDir);
}
protected void invokeApplication() throws Exception {
- TopicHome home = (TopicHome)getInstance("topicHome");
+ TopicHome home = (TopicHome)getInstance(TopicHome.class);
home.newTopic();
}
}.run();
@@ -182,13 +182,13 @@
}
protected void updateModelValues() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forumDir = nodeDAO.findWikiDirectory(102l);
Contexts.getPageContext().set("currentDirectory", forumDir);
}
protected void invokeApplication() throws Exception {
- TopicHome home = (TopicHome)getInstance("topicHome");
+ TopicHome home = (TopicHome)getInstance(TopicHome.class);
home.getInstance().setName("New Topic");
home.setFormContent("This is a new topic.");
@@ -200,12 +200,12 @@
protected void renderResponse() throws Exception {
Long newId = (Long)getValue("#{topicHome.instance.id}");
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDocument newTopic = nodeDAO.findWikiDocument(newId);
assert newTopic.getAreaNumber().equals(100l);
- FeedDAO feedDAO = (FeedDAO)getInstance("feedDAO");
+ FeedDAO feedDAO = (FeedDAO)getInstance(FeedDAO.class);
FeedEntry fe = feedDAO.findFeedEntry(newTopic);
assert fe.getTitle().equals("[Seam Users] New Topic");
1.3 +6 -6 jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/ForumQueryTests.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ForumQueryTests.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/ForumQueryTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ForumQueryTests.java 3 Jan 2008 14:54:34 -0000 1.2
+++ ForumQueryTests.java 10 Jan 2008 08:37:45 -0000 1.3
@@ -35,14 +35,14 @@
new FacesRequest() {
protected void updateModelValues() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forumDir = nodeDAO.findWikiDirectory(100l);
Contexts.getPageContext().set("currentDirectory", forumDir);
}
protected void invokeApplication() throws Exception {
- ForumQuery query = (ForumQuery)getInstance("forumQuery");
+ ForumQuery query = (ForumQuery)getInstance(ForumQuery.class);
List<ForumInfo> forums = query.getForums();
assert forums.size() == 2;
@@ -73,14 +73,14 @@
new FacesRequest() {
protected void updateModelValues() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forumDir = nodeDAO.findWikiDirectory(102l);
Contexts.getPageContext().set("currentDirectory", forumDir);
}
protected void invokeApplication() throws Exception {
- ForumQuery query = (ForumQuery)getInstance("forumQuery");
+ ForumQuery query = (ForumQuery)getInstance(ForumQuery.class);
List<TopicInfo> topics = query.getTopics();
assert topics.size() == 2;
@@ -109,14 +109,14 @@
new FacesRequest() {
protected void updateModelValues() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forumDir = nodeDAO.findWikiDirectory(109l);
Contexts.getPageContext().set("currentDirectory", forumDir);
}
protected void invokeApplication() throws Exception {
- ForumQuery query = (ForumQuery)getInstance("forumQuery");
+ ForumQuery query = (ForumQuery)getInstance(ForumQuery.class);
List<TopicInfo> topics = query.getTopics();
assert topics.size() == 1;
1.2 +4 -4 jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/BlogDAOTests.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BlogDAOTests.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/BlogDAOTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BlogDAOTests.java 19 Dec 2007 04:29:27 -0000 1.1
+++ BlogDAOTests.java 10 Jan 2008 08:37:45 -0000 1.2
@@ -24,7 +24,7 @@
public void findBlogEntriesWithCommentCount() throws Exception {
new FacesRequest() {
protected void invokeApplication() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory blogDir = nodeDAO.findWikiDirectory(51l);
BlogDAO dao = (BlogDAO)getInstance("blogDAO");
@@ -58,7 +58,7 @@
public void findBlogEntriesWithCommentCountLimitDate() throws Exception {
new FacesRequest() {
protected void invokeApplication() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory blogDir = nodeDAO.findWikiDirectory(51l);
BlogDAO dao = (BlogDAO)getInstance("blogDAO");
@@ -124,7 +124,7 @@
public void findBlogEntriesWithCommentCountLimitTag() throws Exception {
new FacesRequest() {
protected void invokeApplication() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory blogDir = nodeDAO.findWikiDirectory(51l);
BlogDAO dao = (BlogDAO)getInstance("blogDAO");
@@ -155,7 +155,7 @@
public void findBlogEntriesWithCommentCountLimitTagDate() throws Exception {
new FacesRequest() {
protected void invokeApplication() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory blogDir = nodeDAO.findWikiDirectory(51l);
BlogDAO dao = (BlogDAO)getInstance("blogDAO");
1.4 +16 -16 jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/ForumDAOTests.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ForumDAOTests.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/plugin/ForumDAOTests.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ForumDAOTests.java 3 Jan 2008 14:54:34 -0000 1.3
+++ ForumDAOTests.java 10 Jan 2008 08:37:45 -0000 1.4
@@ -32,10 +32,10 @@
public void findForumsGuest() throws Exception {
new FacesRequest() {
protected void invokeApplication() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forumDir = nodeDAO.findWikiDirectory(100l);
- ForumDAO dao = (ForumDAO)getInstance("forumDAO");
+ ForumDAO dao = (ForumDAO)getInstance(ForumDAO.class);
Map<Long, ForumInfo> forums = dao.findForums(forumDir);
@@ -52,10 +52,10 @@
new FacesRequest() {
protected void invokeApplication() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forumDir = nodeDAO.findWikiDirectory(100l);
- ForumDAO dao = (ForumDAO)getInstance("forumDAO");
+ ForumDAO dao = (ForumDAO)getInstance(ForumDAO.class);
Map<Long, ForumInfo> forums = dao.findForums(forumDir);
@@ -74,10 +74,10 @@
new FacesRequest() {
protected void invokeApplication() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forumDir = nodeDAO.findWikiDirectory(100l);
- ForumDAO dao = (ForumDAO)getInstance("forumDAO");
+ ForumDAO dao = (ForumDAO)getInstance(ForumDAO.class);
Map<Long, ForumInfo> infos = dao.findForums(forumDir);
assert infos.size() == 2;
@@ -103,10 +103,10 @@
new FacesRequest() {
protected void invokeApplication() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forums = nodeDAO.findWikiDirectory(100l);
- ForumDAO dao = (ForumDAO)getInstance("forumDAO");
+ ForumDAO dao = (ForumDAO)getInstance(ForumDAO.class);
Calendar lastLogin = new GregorianCalendar(2007, 2, 1);
Map<Long, Long> unreadTopics = dao.findUnreadTopicAndParentIds(forums, lastLogin.getTime());
@@ -133,10 +133,10 @@
new FacesRequest() {
protected void invokeApplication() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forum = nodeDAO.findWikiDirectory(102l);
- ForumDAO dao = (ForumDAO)getInstance("forumDAO");
+ ForumDAO dao = (ForumDAO)getInstance(ForumDAO.class);
Calendar lastLogin = new GregorianCalendar(2007, 2, 1);
Map<Long, Long> unreadTopics = dao.findUnreadTopicAndParentIdsInForum(forum, lastLogin.getTime());
@@ -161,10 +161,10 @@
new FacesRequest() {
protected void invokeApplication() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forum = nodeDAO.findWikiDirectory(102l);
- ForumDAO dao = (ForumDAO)getInstance("forumDAO");
+ ForumDAO dao = (ForumDAO)getInstance(ForumDAO.class);
assert dao.findTopicCount(forum).equals(2l);
forum = nodeDAO.findWikiDirectory(109l);
@@ -183,10 +183,10 @@
new FacesRequest() {
protected void invokeApplication() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forum = nodeDAO.findWikiDirectory(102l);
- ForumDAO dao = (ForumDAO)getInstance("forumDAO");
+ ForumDAO dao = (ForumDAO)getInstance(ForumDAO.class);
Map<Long, TopicInfo> topics = dao.findTopics(forum, 0, 10);
@@ -213,10 +213,10 @@
new FacesRequest() {
protected void invokeApplication() throws Exception {
- WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
+ WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
WikiDirectory forum = nodeDAO.findWikiDirectory(109l);
- ForumDAO dao = (ForumDAO)getInstance("forumDAO");
+ ForumDAO dao = (ForumDAO)getInstance(ForumDAO.class);
Map<Long, TopicInfo> topics = dao.findTopics(forum, 0, 10);
More information about the jboss-cvs-commits
mailing list