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

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/editing          
                        ClipboardTests.java Linking.java Tagging.java
                        EditMenu.java TrashTests.java
                        BasicNodeOperations.java DocumentHistoryTests.java
                        Uploading.java EditMacros.java Commenting.java
  Log:
  Better getInstance() calls
  
  Revision  Changes    Path
  1.3       +54 -54    jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/ClipboardTests.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ClipboardTests.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/ClipboardTests.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ClipboardTests.java	9 Jan 2008 15:59:24 -0000	1.2
  +++ ClipboardTests.java	10 Jan 2008 08:37:45 -0000	1.3
  @@ -36,7 +36,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
                   WikiDocument doc = home.getWikiNodeDAO().findWikiDocument(9l);
  @@ -54,10 +54,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
   
                   assert clipboard.getItems().size() == 1;
                   assert clipboard.getItemsAsList().get(0).equals(9l);
  @@ -72,7 +72,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(4l); // Init!
   
                   home.paste();
  @@ -88,10 +88,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
                   assert clipboard.getItems().size() == 0;
                   
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(4l); // Init!
   
                   assert home.getChildNodes().size() == 2;
  @@ -120,7 +120,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
                   WikiUpload upload = home.getWikiNodeDAO().findWikiUpload(30l);
  @@ -138,10 +138,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
   
                   assert clipboard.getItems().size() == 1;
                   assert clipboard.getItemsAsList().get(0).equals(30l);
  @@ -156,7 +156,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(4l); // Init!
   
                   home.paste();
  @@ -172,10 +172,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
                   assert clipboard.getItems().size() == 0;
   
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(4l); // Init!
   
                   assert home.getChildNodes().size() == 2;
  @@ -204,7 +204,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
                   WikiDocument doc = home.getWikiNodeDAO().findWikiDocument(9l);
  @@ -224,10 +224,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
   
                   assert clipboard.getItems().size() == 2;
                   assert !clipboard.isCut(9l);
  @@ -242,7 +242,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(4l); // Init!
   
                   home.paste();
  @@ -258,10 +258,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
                   assert clipboard.getItems().size() == 0;
   
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(4l); // Init!
   
                   assert home.getChildNodes().size() == 3;
  @@ -295,7 +295,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
                   WikiDocument doc = home.getWikiNodeDAO().findWikiDocument(9l);
  @@ -313,10 +313,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
   
                   assert clipboard.getItems().size() == 1;
                   assert clipboard.getItemsAsList().get(0).equals(9l);
  @@ -331,7 +331,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(4l); // Init!
   
                   home.paste();
  @@ -347,10 +347,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
                   assert clipboard.getItems().size() == 0;
   
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(4l); // Init!
   
                   assert home.getChildNodes().size() == 2;
  @@ -375,7 +375,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
                   WikiUpload upload = home.getWikiNodeDAO().findWikiUpload(30l);
  @@ -393,10 +393,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
   
                   assert clipboard.getItems().size() == 1;
                   assert clipboard.getItemsAsList().get(0).equals(30l);
  @@ -411,7 +411,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(4l); // Init!
   
                   home.paste();
  @@ -427,10 +427,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
                   assert clipboard.getItems().size() == 0;
   
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(4l); // Init!
   
                   assert home.getChildNodes().size() == 2;
  @@ -459,7 +459,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
                   WikiDocument doc = home.getWikiNodeDAO().findWikiDocument(9l);
  @@ -479,10 +479,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
   
                   assert clipboard.getItems().size() == 2;
   
  @@ -498,7 +498,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(4l); // Init!
   
                   home.paste();
  @@ -514,10 +514,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
                   assert clipboard.getItems().size() == 0;
   
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(4l); // Init!
   
                   assert home.getChildNodes().size() == 3;
  @@ -554,7 +554,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
                   WikiDocument doc = home.getWikiNodeDAO().findWikiDocument(9l);
  @@ -572,10 +572,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
   
                   assert clipboard.getItems().size() == 1;
                   assert clipboard.getItemsAsList().get(0).equals(9l);
  @@ -590,7 +590,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
                   home.paste();
  @@ -606,10 +606,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
                   assert clipboard.getItems().size() == 0;
   
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
                   assert home.getChildNodes().size() == 3;
  @@ -632,7 +632,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
                   WikiDocument doc = home.getWikiNodeDAO().findWikiDocument(9l);
  @@ -650,10 +650,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
   
                   assert clipboard.getItems().size() == 1;
                   assert clipboard.getItemsAsList().get(0).equals(9l);
  @@ -668,7 +668,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
                   home.paste();
  @@ -684,10 +684,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
                   assert clipboard.getItems().size() == 0;
   
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
                   assert home.getChildNodes().size() == 4;
  @@ -706,7 +706,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(3l); // Init!
   
                   WikiDocument doc = home.getWikiNodeDAO().findWikiDocument(6l);
  @@ -724,10 +724,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(3l); // Init!
   
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
   
                   assert clipboard.getItems().size() == 1;
                   assert clipboard.getItemsAsList().get(0).equals(6l);
  @@ -742,7 +742,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
                   home.paste();
  @@ -758,10 +758,10 @@
               }
   
               protected void renderResponse() throws Exception {
  -                Clipboard clipboard = (Clipboard)getInstance("clipboard");
  +                Clipboard clipboard = (Clipboard)getInstance(Clipboard.class);
                   assert clipboard.getItems().size() == 0;
   
  -                DirectoryHome home = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome home = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert home.getInstance().getId().equals(2l); // Init!
   
                   assert home.getChildNodes().size() == 4;
  
  
  
  1.2       +4 -4      jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Linking.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Linking.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Linking.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Linking.java	19 Dec 2007 04:29:24 -0000	1.1
  +++ Linking.java	10 Jan 2008 08:37:45 -0000	1.2
  @@ -44,7 +44,7 @@
               protected void invokeApplication() throws Exception {
                   assert Conversation.instance().isLongRunning();
   
  -                DocumentHome docHome = (DocumentHome)getInstance("documentHome");
  +                DocumentHome docHome = (DocumentHome)getInstance(DocumentHome.class);
                   assert docHome.getInstance().getId().equals(6l); // Init!
   
                   docHome.setFormContent("[=>http://foo.bar]");
  @@ -103,7 +103,7 @@
               protected void invokeApplication() throws Exception {
                   assert Conversation.instance().isLongRunning();
   
  -                DocumentHome docHome = (DocumentHome)getInstance("documentHome");
  +                DocumentHome docHome = (DocumentHome)getInstance(DocumentHome.class);
                   assert docHome.getInstance().getId().equals(6l); // Init!
   
                   docHome.setFormContent("[=>Two]");
  @@ -154,7 +154,7 @@
               protected void invokeApplication() throws Exception {
                   assert Conversation.instance().isLongRunning();
   
  -                DocumentHome docHome = (DocumentHome)getInstance("documentHome");
  +                DocumentHome docHome = (DocumentHome)getInstance(DocumentHome.class);
                   assert docHome.getInstance().getId().equals(6l); // Init!
   
                   docHome.setFormContent("[=>Two]");
  @@ -189,7 +189,7 @@
               protected void invokeApplication() throws Exception {
                   assert Conversation.instance().isLongRunning();
   
  -                DocumentHome docHome = (DocumentHome)getInstance("documentHome");
  +                DocumentHome docHome = (DocumentHome)getInstance(DocumentHome.class);
                   assert docHome.getInstance().getId().equals(6l); // Init!
   
                   assert docHome.getInstance().getOutgoingLinks().size() == 0;
  
  
  
  1.2       +6 -6      jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Tagging.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Tagging.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Tagging.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Tagging.java	19 Dec 2007 04:29:24 -0000	1.1
  +++ Tagging.java	10 Jan 2008 08:37:45 -0000	1.2
  @@ -44,7 +44,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DocumentHome docHome = (DocumentHome)getInstance("documentHome");
  +                DocumentHome docHome = (DocumentHome)getInstance(DocumentHome.class);
   
                   assert docHome.getInstance().getId().equals(6l); // Init!
   
  @@ -55,12 +55,12 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DocumentHome docHome = (DocumentHome)getInstance("documentHome");
  +                DocumentHome docHome = (DocumentHome)getInstance(DocumentHome.class);
                   assert docHome.getInstance().getTags().size() == 2;
                   assert docHome.getInstance().getTagsAsList().get(0).equals("New Tag");
                   assert docHome.getInstance().getTagsAsList().get(1).equals("Tag One");
   
  -                TagQuery tagQuery = (TagQuery)getInstance("tagQuery");
  +                TagQuery tagQuery = (TagQuery)getInstance(TagQuery.class);
                   tagQuery.setTag("New Tag");
                   List<WikiFile> taggedFiles = tagQuery.getTaggedFiles();
                   assert taggedFiles.size() == 1;
  @@ -86,7 +86,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                UploadHome uploadHome = (UploadHome)getInstance("uploadHome");
  +                UploadHome uploadHome = (UploadHome)getInstance(UploadHome.class);
                   assert uploadHome.getInstance().getId().equals(30l); // Init!
   
                   assert uploadHome.getInstance().getTags().size() == 0;
  @@ -95,11 +95,11 @@
               }
   
               protected void renderResponse() throws Exception {
  -                UploadHome uploadHome = (UploadHome)getInstance("uploadHome");
  +                UploadHome uploadHome = (UploadHome)getInstance(UploadHome.class);
                   assert uploadHome.getInstance().getTags().size() == 1;
                   assert uploadHome.getInstance().getTagsAsList().get(0).equals("New Tag");
   
  -                TagQuery tagQuery = (TagQuery)getInstance("tagQuery");
  +                TagQuery tagQuery = (TagQuery)getInstance(TagQuery.class);
                   tagQuery.setTag("New Tag");
                   List<WikiFile> taggedFiles = tagQuery.getTaggedFiles();
                   assert taggedFiles.size() == 1;
  
  
  
  1.2       +9 -9      jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/EditMenu.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EditMenu.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/EditMenu.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- EditMenu.java	19 Dec 2007 04:29:24 -0000	1.1
  +++ EditMenu.java	10 Jan 2008 08:37:45 -0000	1.2
  @@ -43,7 +43,7 @@
   
               protected void invokeApplication() throws Exception {
                   assert Conversation.instance().isLongRunning();
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(2l); // Init!
                   assert dirHome.getAvailableMenuItems().size() == 0;
               }
  @@ -73,7 +73,7 @@
               protected void invokeApplication() throws Exception {
                   assert Conversation.instance().isLongRunning();
   
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(3l); // Init!
   
                   assert dirHome.getMenuItems().size() == 1;
  @@ -90,7 +90,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getMenuItems().size() == 2;
                   WikiMenuItem[] menuItems = dirHome.getMenuItems().toArray(new WikiMenuItem[dirHome.getMenuItems().size()]);
                   assert menuItems[0].getDirectoryId().equals(4l);
  @@ -126,7 +126,7 @@
               protected void invokeApplication() throws Exception {
                   assert Conversation.instance().isLongRunning();
   
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(3l); // Init!
   
                   assert dirHome.getMenuItems().size() == 1;
  @@ -138,7 +138,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getMenuItems().size() == 0;
               }
           }.run();
  @@ -167,7 +167,7 @@
               protected void invokeApplication() throws Exception {
                   assert Conversation.instance().isLongRunning();
   
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(3l); // Init!
   
                   assert dirHome.getMenuItems().size() == 1;
  @@ -183,7 +183,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getMenuItems().size() == 1;
                   WikiMenuItem[] menuItems = dirHome.getMenuItems().toArray(new WikiMenuItem[dirHome.getMenuItems().size()]);
                   assert menuItems[0].getDirectoryId().equals(5l);
  @@ -215,7 +215,7 @@
               protected void invokeApplication() throws Exception {
                   assert Conversation.instance().isLongRunning();
   
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(3l); // Init!
   
                   assert dirHome.getMenuItems().size() == 1;
  @@ -230,7 +230,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getMenuItems().size() == 2;
                   WikiMenuItem[] menuItems = dirHome.getMenuItems().toArray(new WikiMenuItem[dirHome.getMenuItems().size()]);
                   assert menuItems[0].getDirectoryId().equals(5l);
  
  
  
  1.2       +20 -20    jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/TrashTests.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TrashTests.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/TrashTests.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- TrashTests.java	9 Jan 2008 15:59:24 -0000	1.1
  +++ TrashTests.java	10 Jan 2008 08:37:45 -0000	1.2
  @@ -56,12 +56,12 @@
   
               protected void invokeApplication() throws Exception {
   
  -                PreferenceRegistry registry = (PreferenceRegistry)getInstance("preferenceRegistry");
  +                PreferenceRegistry registry = (PreferenceRegistry)getInstance(PreferenceRegistry.class);
                   PreferenceEntity wikiEntity = registry.getPreferenceEntitiesByName().get("Wiki");
   
                   invokeMethod("#{adminHome.initPreferencesEditor}");
   
  -                PreferenceEditor prefEditor = (PreferenceEditor)getInstance("preferenceEditor");
  +                PreferenceEditor prefEditor = (PreferenceEditor)getInstance(PreferenceEditor.class);
                   prefEditor.selectPreferenceEntity(wikiEntity);
               }
   
  @@ -74,7 +74,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                PreferenceEditor prefEditor = (PreferenceEditor)getInstance("preferenceEditor");
  +                PreferenceEditor prefEditor = (PreferenceEditor)getInstance(PreferenceEditor.class);
                   List<PreferenceValue> values = prefEditor.getPreferenceValues();
                   // This is somewhat dodgy... no other way to get the value we want
                   for (PreferenceValue value : values) {
  @@ -101,7 +101,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DocumentHome docHome = (DocumentHome)getInstance("documentHome");
  +                DocumentHome docHome = (DocumentHome)getInstance(DocumentHome.class);
                   assert docHome.getInstance().getId().equals(6l); // Init!
   
                   assert invokeMethod("#{documentHome.remove}").equals("removed");
  @@ -117,7 +117,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(17l); // Init!
   
                   assert dirHome.getChildNodes().size() == 1;
  @@ -134,7 +134,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(17l); // Init!
                   dirHome.emptyTrash();
               }
  @@ -147,12 +147,12 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(17l); // Init!
   
                   assert dirHome.getChildNodes().size() == 0;
   
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   assert dao.findWikiNode(6l) == null;
   
                   assert dao.findWikiComment(10l) == null;
  @@ -185,7 +185,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DocumentHome docHome = (DocumentHome)getInstance("documentHome");
  +                DocumentHome docHome = (DocumentHome)getInstance(DocumentHome.class);
                   assert docHome.getInstance().getId().equals(9l); // Init!
   
                   assert invokeMethod("#{documentHome.remove}").equals("removed");
  @@ -193,10 +193,10 @@
   
               // Feed entries should be gone
               protected void renderResponse() throws Exception {
  -                WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO nodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   WikiDocument document = nodeDAO.findWikiDocument(9l);
   
  -                FeedDAO feedDAO = (FeedDAO)getInstance("feedDAO");
  +                FeedDAO feedDAO = (FeedDAO)getInstance(FeedDAO.class);
   
                   List<WikiFeed> feeds = feedDAO.findFeeds(document);
                   assert feeds.size() == 0;
  @@ -212,7 +212,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(17l); // Init!
   
                   assert dirHome.getChildNodes().size() == 1;
  @@ -229,7 +229,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(17l); // Init!
                   dirHome.emptyTrash();
               }
  @@ -242,12 +242,12 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(17l); // Init!
   
                   assert dirHome.getChildNodes().size() == 0;
   
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   assert dao.findWikiNode(9l) == null;
   
                   assert getRenderedViewId().equals("/dirDisplay_d.xhtml");
  @@ -273,7 +273,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                UploadHome uploadHome = (UploadHome)getInstance("uploadHome");
  +                UploadHome uploadHome = (UploadHome)getInstance(UploadHome.class);
                   assert uploadHome.getInstance().getId().equals(30l); // Init!
   
                   assert invokeMethod("#{uploadHome.remove}").equals("removed");
  @@ -289,7 +289,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(17l); // Init!
   
                   assert dirHome.getChildNodes().size() == 1;
  @@ -306,7 +306,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(17l); // Init!
                   dirHome.emptyTrash();
               }
  @@ -319,11 +319,11 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
   
                   assert dirHome.getChildNodes().size() == 0;
   
  -                WikiNodeDAO dao = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO dao = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   assert dao.findWikiNode(30l) == null;
   
                   assert getRenderedViewId().equals("/dirDisplay_d.xhtml");
  
  
  
  1.7       +6 -6      jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/BasicNodeOperations.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BasicNodeOperations.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/BasicNodeOperations.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- BasicNodeOperations.java	9 Jan 2008 15:59:24 -0000	1.6
  +++ BasicNodeOperations.java	10 Jan 2008 08:37:46 -0000	1.7
  @@ -45,7 +45,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(5l); // Init!
                   assert invokeMethod("#{directoryHome.remove}").equals("removed");
   
  @@ -78,7 +78,7 @@
   
               protected void invokeApplication() throws Exception {
   
  -                DocumentHome docHome = (DocumentHome)getInstance("documentHome");
  +                DocumentHome docHome = (DocumentHome)getInstance(DocumentHome.class);
                   docHome.getInstance().setName("Test Name");
                   docHome.setFormContent("Test Content");
   
  @@ -126,7 +126,7 @@
               protected void invokeApplication() throws Exception {
                   assert Conversation.instance().isLongRunning();
   
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(4l); // Init!
   
                   // Just take the first one, these should be ordered by name, but there is only one there
  @@ -138,7 +138,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getDefaultFile().getId().equals(newDefaultDocumentId);
               }
           }.run();
  @@ -165,7 +165,7 @@
               protected void invokeApplication() throws Exception {
                   assert Conversation.instance().isLongRunning();
   
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getId().equals(3l); // Init!
   
                   // Switch from first to second, these are ordered by name, "One", "Two"
  @@ -177,7 +177,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DirectoryHome dirHome = (DirectoryHome)getInstance("directoryHome");
  +                DirectoryHome dirHome = (DirectoryHome)getInstance(DirectoryHome.class);
                   assert dirHome.getInstance().getDefaultFile().getId().equals(newDefaultDocumentId);
                   assert newDefaultDocumentId.equals(7l);
               }
  
  
  
  1.2       +5 -5      jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/DocumentHistoryTests.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DocumentHistoryTests.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/DocumentHistoryTests.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- DocumentHistoryTests.java	19 Dec 2007 04:29:24 -0000	1.1
  +++ DocumentHistoryTests.java	10 Jan 2008 08:37:46 -0000	1.2
  @@ -33,7 +33,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DocumentHome docHome = (DocumentHome)getInstance("documentHome");
  +                DocumentHome docHome = (DocumentHome)getInstance(DocumentHome.class);
                   assert docHome.getInstance().getId().equals(6l); // Init!
   
                   WikiDocument doc = (WikiDocument)getValue("#{currentDocument}");
  @@ -83,7 +83,7 @@
               }
   
               protected void invokeApplication() throws Exception {
  -                DocumentHome docHome = (DocumentHome)getInstance("documentHome");
  +                DocumentHome docHome = (DocumentHome)getInstance(DocumentHome.class);
                   docHome.getInstance().setName("Test Name");
                   docHome.setFormContent("Test Content");
   
  @@ -95,7 +95,7 @@
                   WikiFile newFile = (WikiFile)getValue("#{documentHome.instance}");
   
                   // Shouldn't have any historical data
  -                WikiNodeDAO wikiNodeDAO = (WikiNodeDAO)getInstance("wikiNodeDAO");
  +                WikiNodeDAO wikiNodeDAO = (WikiNodeDAO)getInstance(WikiNodeDAO.class);
                   assert wikiNodeDAO.findHistoricalFiles(newFile).size() == 0;
                   assert wikiNodeDAO.findNumberOfHistoricalFiles(newFile).equals(0l);
               }
  @@ -126,7 +126,7 @@
               protected void invokeApplication() throws Exception {
                   assert Conversation.instance().isLongRunning();
   
  -                DocumentHome docHome = (DocumentHome)getInstance("documentHome");
  +                DocumentHome docHome = (DocumentHome)getInstance(DocumentHome.class);
                   assert docHome.getInstance().getId().equals(6l); // Init!
   
                   docHome.getFormContent(); // Initialize historical revision
  @@ -145,7 +145,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                DocumentHome docHome = (DocumentHome)getInstance("documentHome");
  +                DocumentHome docHome = (DocumentHome)getInstance(DocumentHome.class);
                   assert docHome.getInstance().getId().equals(6l); // Init!
   
                   assert docHome.isHistoricalFilesPresent();
  
  
  
  1.2       +2 -2      jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Uploading.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Uploading.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Uploading.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Uploading.java	19 Dec 2007 04:29:24 -0000	1.1
  +++ Uploading.java	10 Jan 2008 08:37:46 -0000	1.2
  @@ -39,7 +39,7 @@
   
               protected void invokeApplication() throws Exception {
   
  -                Uploader uploader = (Uploader) getInstance("uploader");
  +                Uploader uploader = (Uploader) getInstance(Uploader.class);
   
                   assert uploader.getParentDirectoryId().equals(2l);
   
  @@ -70,7 +70,7 @@
   
               protected void invokeApplication() throws Exception {
   
  -                UploadHome uploadHome = (UploadHome)getInstance("uploadHome");
  +                UploadHome uploadHome = (UploadHome)getInstance(UploadHome.class);
                   uploadHome.setEdit(true);
   
                   assert uploadHome.getInstance().getFilename().equals("testupload2.zip");
  
  
  
  1.4       +2 -2      jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/EditMacros.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EditMacros.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/EditMacros.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- EditMacros.java	1 Jan 2008 13:01:23 -0000	1.3
  +++ EditMacros.java	10 Jan 2008 08:37:46 -0000	1.4
  @@ -40,7 +40,7 @@
               protected void invokeApplication() throws Exception {
                   assert Conversation.instance().isLongRunning();
   
  -                DocumentHome docHome = (DocumentHome)getInstance("documentHome");
  +                DocumentHome docHome = (DocumentHome)getInstance(DocumentHome.class);
                   assert docHome.getInstance().getId().equals(6l); // Init!
   
                   assert docHome.getInstance().getHeaderMacros().size() == 2;
  @@ -81,7 +81,7 @@
               protected void invokeApplication() throws Exception {
                   assert Conversation.instance().isLongRunning();
   
  -                DocumentHome docHome = (DocumentHome)getInstance("documentHome");
  +                DocumentHome docHome = (DocumentHome)getInstance(DocumentHome.class);
                   assert docHome.getInstance().getId().equals(6l); // Init!
   
                   docHome.setFormContent("[<=contentMacro[param=value]]");
  
  
  
  1.3       +3 -3      jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Commenting.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Commenting.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/test/org/jboss/seam/wiki/test/editing/Commenting.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Commenting.java	9 Jan 2008 15:59:24 -0000	1.2
  +++ Commenting.java	10 Jan 2008 08:37:46 -0000	1.3
  @@ -41,7 +41,7 @@
   
               protected void invokeApplication() throws Exception {
   
  -                CommentHome commentHome = (CommentHome)getInstance("commentHome");
  +                CommentHome commentHome = (CommentHome)getInstance(CommentHome.class);
   
                   commentHome.newComment();
   
  @@ -55,7 +55,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                CommentQuery commentQuery = (CommentQuery)getInstance("commentQuery");
  +                CommentQuery commentQuery = (CommentQuery)getInstance(CommentQuery.class);
                   assert commentQuery.getComments().size() == 7;
   
                   assert commentQuery.getComments().get(0).getId().equals(10l);
  @@ -97,7 +97,7 @@
               }
   
               protected void renderResponse() throws Exception {
  -                CommentQuery commentQuery = (CommentQuery)getInstance("commentQuery");
  +                CommentQuery commentQuery = (CommentQuery)getInstance(CommentQuery.class);
                   assert commentQuery.getComments().size() == 4;
                   assert commentQuery.getComments().get(0).getId().equals(10l);
                   assert commentQuery.getComments().get(0).getLevel().equals(1l);
  
  
  



More information about the jboss-cvs-commits mailing list