[jboss-cvs] jboss-seam/examples/messages/src/org/jboss/seam/example/messages/test ...

[Gavin King]

  User: gavin   
  Date: 06/10/26 14:53:00

  Modified:    examples/messages/src/org/jboss/seam/example/messages/test 
                        MessageListTest.java
  Log:
  much nicer
  
  Revision  Changes    Path
  1.8       +11 -18    jboss-seam/examples/messages/src/org/jboss/seam/example/messages/test/MessageListTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MessageListTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/messages/src/org/jboss/seam/example/messages/test/MessageListTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- MessageListTest.java	25 Oct 2006 23:58:48 -0000	1.7
  +++ MessageListTest.java	26 Oct 2006 18:53:00 -0000	1.8
  @@ -1,11 +1,7 @@
  -//$Id: MessageListTest.java,v 1.7 2006/10/25 23:58:48 gavin Exp $
  +//$Id: MessageListTest.java,v 1.8 2006/10/26 18:53:00 gavin Exp $
   package org.jboss.seam.example.messages.test;
   import javax.faces.model.DataModel;
   
  -import org.jboss.seam.Component;
  -import org.jboss.seam.example.messages.Message;
  -import org.jboss.seam.example.messages.MessageManager;
  -import org.jboss.seam.example.messages.MessageManagerBean;
   import org.jboss.seam.mock.SeamTest;
   import org.testng.annotations.Test;
   
  @@ -19,7 +15,7 @@
   
            @Override
            protected void renderResponse() throws Exception {
  -            DataModel list = (DataModel) Component.getInstance("messageList", true);
  +            DataModel list = (DataModel) getInstance("messageList");
               assert list.getRowCount()==2;
            }
            
  @@ -30,7 +26,7 @@
   
            @Override
            protected void updateModelValues() throws Exception {
  -            DataModel list = (DataModel) Component.getInstance("messageList", true);
  +            DataModel list = (DataModel) getInstance("messageList");
               assert list.getRowCount()==2;
               list.setRowIndex(1);
            }
  @@ -38,18 +34,16 @@
            
            @Override
            protected void invokeApplication() throws Exception {
  -            MessageManager ml = (MessageManager) Component.getInstance(MessageManagerBean.class, true);
  -            ml.select();
  +            invokeMethod("#{messageManager.select}");
            }
   
   
            @Override
            protected void renderResponse() throws Exception {
  -            DataModel list = (DataModel) Component.getInstance("messageList", true);
  +            DataModel list = (DataModel) getInstance("messageList");
               assert list.getRowCount()==2;
  -            Message message = (Message) Component.getInstance(Message.class, false);
  -            assert message.getTitle().equals("Hello World");
  -            assert message.isRead();
  +            assert getValue("#{message.title}").equals("Hello World");
  +            assert getValue("#{message.read}").equals(true);
            }
            
         }.run();
  @@ -59,7 +53,7 @@
   
            @Override
            protected void updateModelValues() throws Exception {
  -            DataModel list = (DataModel) Component.getInstance("messageList", true);
  +            DataModel list = (DataModel) getInstance("messageList");
               assert list.getRowCount()==2;
               list.setRowIndex(0);
            }
  @@ -67,14 +61,13 @@
            
            @Override
            protected void invokeApplication() throws Exception {
  -            MessageManager ml = (MessageManager) Component.getInstance(MessageManagerBean.class, true);
  -            ml.delete();
  +            invokeMethod("#{messageManager.delete}");
            }
   
   
            @Override
            protected void renderResponse() throws Exception {
  -            DataModel list = (DataModel) Component.getInstance("messageList", true);
  +            DataModel list = (DataModel) getInstance("messageList");
               assert list.getRowCount()==1;
            }
            
  @@ -85,7 +78,7 @@
   
            @Override
            protected void renderResponse() throws Exception {
  -            DataModel list = (DataModel) Component.getInstance("messageList", true);
  +            DataModel list = (DataModel) getInstance("messageList");
               assert list.getRowCount()==1;
            }