[jboss-cvs] jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/dao ...

Christian Bauer christian at hibernate.org
Thu Jan 10 03:37:46 EST 2008


  User: cbauer  
  Date: 08/01/10 03:37:46

  Modified:    examples/wiki/src/test/org/jboss/seam/wiki/test/dao  
                        WikiNodeDAOTests.java TagDAOTests.java
  Log:
  Better getInstance() calls
  
  Revision  Changes    Path
  1.5       +16 -16    jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/dao/WikiNodeDAOTests.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WikiNodeDAOTests.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/dao/WikiNodeDAOTests.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- WikiNodeDAOTests.java	9 Jan 2008 15:59:25 -0000	1.4
  +++ WikiNodeDAOTests.java	10 Jan 2008 08:37:46 -0000	1.5
  @@ -30,7 +30,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   WikiDocument d = dao.findWikiDocument(6l);
                   assert d.getName().equals("One");
               }
  @@ -42,7 +42,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   WikiDirectory dir = dao.findWikiDirectory(3l);
                   WikiFile d = dao.findDefaultWikiFile(dir);
                   assert d.getName().equals("One");
  @@ -56,7 +56,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   WikiDirectory dir = dao.findWikiDirectory(3l);
                   WikiDocument d = dao.findDefaultDocument(dir);
                   assert d.getName().equals("One");
  @@ -69,7 +69,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   WikiDocument d = dao.findWikiDocumentInArea(3l, "Two");
                   assert d.getName().equals("Two");
                   assert d.getId().equals(7l);
  @@ -82,7 +82,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   List<WikiDocument> result = dao.findWikiDocumentsOrderByLastModified(2);
                   assert result.size() == 2;
                   assert result.get(0).getId().equals(6l);
  @@ -96,7 +96,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   WikiDirectory d = dao.findWikiDirectory(1l);
                   assert d.getName().equals("AAA");
               }
  @@ -108,7 +108,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   WikiDirectory d = dao.findWikiDirectoryInArea(3l, "DDD");
                   assert d.getName().equals("DDD");
                   assert d.getId().equals(4l);
  @@ -121,7 +121,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   WikiDirectory d = dao.findArea("BBB");
                   assert d.getName().equals("BBB");
                   assert d.getId().equals(2l);
  @@ -134,7 +134,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   WikiDirectory d = dao.findArea(2l);
                   assert d.getName().equals("BBB");
                   assert d.getId().equals(2l);
  @@ -147,7 +147,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   Boolean result = dao.isUniqueWikiname(3l, "Foobar");
                   assert result;
               }
  @@ -159,7 +159,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   Boolean result = dao.isUniqueWikiname(3l, "One");
                   assert !result;
               }
  @@ -171,7 +171,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   WikiDocument newDoc = new WikiDocument();
                   newDoc.setWikiname("Foobar");
                   Boolean result = dao.isUniqueWikiname(3l, newDoc);
  @@ -185,7 +185,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   WikiDocument newDoc = new WikiDocument();
                   newDoc.setWikiname("One");
                   Boolean result = dao.isUniqueWikiname(3l, newDoc);
  @@ -199,7 +199,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   WikiDocument d = dao.findWikiDocument(6l);
                   assert d.getName().equals("One");
   
  @@ -227,7 +227,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
   
                   WikiComment rootOne = dao.findWikiComment(10l);
                   List<WikiComment> commentsOne = dao.findWikiCommentSubtree(rootOne);
  @@ -255,7 +255,7 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   WikiDocument d = dao.findWikiDocument(6l);
                   assert d.getName().equals("One");
   
  
  
  
  1.2       +3 -3      jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/dao/TagDAOTests.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TagDAOTests.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/dao/TagDAOTests.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- TagDAOTests.java	19 Dec 2007 04:29:34 -0000	1.1
  +++ TagDAOTests.java	10 Jan 2008 08:37:46 -0000	1.2
  @@ -31,7 +31,7 @@
               protected void invokeApplication() throws Exception {
                   WikiDirectory wikiRoot = (WikiDirectory)getInstance("wikiRoot");
   
  -                TagDAO dao = (TagDAO)getInstance("tagDAO");
  +                TagDAO dao = (TagDAO)getInstance(TagDAO.class);
                   List<DisplayTagCount> tags = dao.findTagCounts(wikiRoot, null, 0);
                   assert tags.size() == 3;
                   assert tags.get(0).getTag().equals("Tag One");
  @@ -50,9 +50,9 @@
           new FacesRequest() {
   
               protected void invokeApplication() throws Exception {
  -                WikiDirectory startDir = ((WikiNodeDAO)getInstance("wikiNodeDAO")).findWikiDirectory(4l);
  +                WikiDirectory startDir = ((WikiNodeDAO)getInstance(WikiNodeDAO.class)).findWikiDirectory(4l);
   
  -                TagDAO dao = (TagDAO)getInstance("tagDAO");
  +                TagDAO dao = (TagDAO)getInstance(TagDAO.class);
                   List<DisplayTagCount> tags = dao.findTagCounts(startDir, null, 2);
   
                   assert tags.size() == 2;
  
  
  



More information about the jboss-cvs-commits mailing list