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

[Gavin King]

  User: gavin   
  Date: 06/10/26 14:34:41

  Modified:    examples/registration/src/org/jboss/seam/example/registration/test 
                        RegisterTest.java
  Log:
  much nicer
  
  Revision  Changes    Path
  1.8       +42 -18    jboss-seam/examples/registration/src/org/jboss/seam/example/registration/test/RegisterTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RegisterTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/registration/src/org/jboss/seam/example/registration/test/RegisterTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- RegisterTest.java	26 Oct 2006 13:40:15 -0000	1.7
  +++ RegisterTest.java	26 Oct 2006 18:34:41 -0000	1.8
  @@ -1,9 +1,8 @@
  -//$Id: RegisterTest.java,v 1.7 2006/10/26 13:40:15 gavin Exp $
  +//$Id: RegisterTest.java,v 1.8 2006/10/26 18:34:41 gavin Exp $
   package org.jboss.seam.example.registration.test;
   
  -import org.jboss.seam.Component;
  -import org.jboss.seam.example.registration.Register;
  -import org.jboss.seam.example.registration.User;
  +import javax.faces.context.FacesContext;
  +
   import org.jboss.seam.mock.SeamTest;
   import org.testng.annotations.Test;
   
  @@ -19,20 +18,16 @@
            @Override
            protected void updateModelValues() throws Exception
            {
  -            User user = (User) Component.getInstance("user", true);
  -            assert user!=null;
  -            user.setUsername("1ovthafew");
  -            user.setPassword("secret");
  -            user.setName("Gavin King");
  +            setValue("#{user.username}", "1ovthafew");
  +            setValue("#{user.name}", "Gavin King");
  +            setValue("#{user.password}", "secret");
            }
   
            @Override
            protected void invokeApplication()
            {
  -            Register register = (Register) Component.getInstance("register", true);
  -            String outcome = register.register();
  -            assert "/registered.jspx".equals(outcome);
  -            setOutcome(outcome);
  +            assert invokeMethod("#{register.register}").equals("/registered.jspx");
  +            setOutcome("/registered.jspx");
            }
            
            @Override
  @@ -50,11 +45,40 @@
            @Override
            protected void renderResponse()
            {
  -            User user = (User) Component.getInstance("user", false);
  -            assert user!=null;
  -            assert user.getName().equals("Gavin King");
  -            assert user.getUsername().equals("1ovthafew");
  -            assert user.getPassword().equals("secret");
  +            assert getValue("#{user.username}").equals("1ovthafew");
  +            assert getValue("#{user.password}").equals("secret");
  +            assert getValue("#{user.name}").equals("Gavin King");
  +         }
  +         
  +      }.run();
  +      
  +      new FacesRequest("/register.jspx") {
  +
  +         @Override
  +         protected void updateModelValues() throws Exception
  +         {
  +            setValue("#{user.username}", "1ovthafew");
  +            setValue("#{user.name}", "Gavin A King");
  +            setValue("#{user.password}", "password");
  +         }
  +
  +         @Override
  +         protected void invokeApplication()
  +         {
  +            assert invokeMethod("#{register.register}")==null;
  +         }
  +         
  +         @Override
  +         protected void renderResponse() throws Exception
  +         {
  +            assert FacesContext.getCurrentInstance().getMessages().hasNext();
  +         }
  +         
  +         @Override
  +         protected void afterRequest()
  +         {
  +            assert isInvokeApplicationComplete();
  +            assert isRenderResponseComplete();
            }
            
         }.run();