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

[Gavin King]

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

  Modified:    examples/todo/src/org/jboss/seam/example/todo/test 
                        TodoTest.java
  Log:
  much nicer
  
  Revision  Changes    Path
  1.10      +10 -13    jboss-seam/examples/todo/src/org/jboss/seam/example/todo/test/TodoTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TodoTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/todo/src/org/jboss/seam/example/todo/test/TodoTest.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- TodoTest.java	25 Oct 2006 23:55:58 -0000	1.9
  +++ TodoTest.java	26 Oct 2006 18:53:00 -0000	1.10
  @@ -1,13 +1,10 @@
  -//$Id: TodoTest.java,v 1.9 2006/10/25 23:55:58 gavin Exp $
  +//$Id: TodoTest.java,v 1.10 2006/10/26 18:53:00 gavin Exp $
   package org.jboss.seam.example.todo.test;
   
   import java.util.List;
   
  -import org.jboss.seam.Component;
   import org.jboss.seam.core.Actor;
   import org.jboss.seam.core.TaskInstanceList;
  -import org.jboss.seam.example.todo.Login;
  -import org.jboss.seam.example.todo.TodoList;
   import org.jboss.seam.jsf.SeamExtendedManagedPersistencePhaseListener;
   import org.jboss.seam.jsf.SeamPhaseListener;
   import org.jboss.seam.mock.SeamTest;
  @@ -28,20 +25,20 @@
            @Override
            protected void updateModelValues() throws Exception
            {
  -            ( (Login) Component.getInstance(Login.class, true) ).setUser("gavin");
  +            setValue("#{login.user}", "gavin");
            }
   
            @Override
            protected void invokeApplication() throws Exception
            {
  -            assert "/todo.jsp".equals( ( (Login) Component.getInstance(Login.class, false) ).login() );
  +            assert invokeMethod("#{login.login}").equals("/todo.jsp");
               assert Actor.instance().getId().equals("gavin");
            }
   
            @Override
            protected void renderResponse() throws Exception
            {
  -            assert ( (List) Component.getInstance(TaskInstanceList.class, true) ).size()==0;
  +            assert ( (List) getInstance(TaskInstanceList.class) ).size()==0;
            }
            
         }.run();
  @@ -52,19 +49,19 @@
            @Override
            protected void updateModelValues() throws Exception
            {
  -            ( (TodoList) Component.getInstance(TodoList.class, true) ).setDescription("Kick Roy out of my office");
  +            setValue("#{todoList.description}", "Kick Roy out of my office");
            }
   
            @Override
            protected void invokeApplication() throws Exception
            {
  -            ( (TodoList) Component.getInstance(TodoList.class, false) ).createTodo();
  +            invokeMethod("#{todoList.createTodo}");
            }
            
            @Override
            protected void renderResponse() throws Exception
            {
  -            List<TaskInstance> tasks = (List<TaskInstance>) Component.getInstance(TaskInstanceList.class, true);
  +            List<TaskInstance> tasks = (List<TaskInstance>) getInstance(TaskInstanceList.class);
               assert tasks.size()==1;
               TaskInstance taskInstance = tasks.get(0);
               assert taskInstance.getDescription().equals("Kick Roy out of my office");
  @@ -80,19 +77,19 @@
            @Override
            protected void beforeRequest()
            {
  -            getParameters().put( "taskId", new String[] { Long.toString(taskId) } );
  +            setParameter("taskId", Long.toString(taskId));
            }
   
            @Override
            protected void invokeApplication() throws Exception
            {
  -            ( (TodoList) Component.getInstance(TodoList.class, true) ).done();
  +            invokeMethod("#{todoList.done}");
            }
            
            @Override
            protected void renderResponse() throws Exception
            {
  -            assert ( (List) Component.getInstance(TaskInstanceList.class, true) ).size()==0;
  +            assert ( (List) getInstance(TaskInstanceList.class) ).size()==0;
            }
            
         }.run();