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

Gavin King gavin.king at jboss.com
Wed Oct 25 19:30:30 EDT 2006


  User: gavin   
  Date: 06/10/25 19:30:30

  Modified:    examples/numberguess/src/org/jboss/seam/example/numberguess/test 
                        NumberGuessTest.java
  Log:
  use improved test harness
  
  Revision  Changes    Path
  1.6       +71 -38    jboss-seam/examples/numberguess/src/org/jboss/seam/example/numberguess/test/NumberGuessTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NumberGuessTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/numberguess/src/org/jboss/seam/example/numberguess/test/NumberGuessTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- NumberGuessTest.java	10 Jun 2006 07:26:09 -0000	1.5
  +++ NumberGuessTest.java	25 Oct 2006 23:30:30 -0000	1.6
  @@ -1,4 +1,4 @@
  -//$Id: NumberGuessTest.java,v 1.5 2006/06/10 07:26:09 gavin Exp $
  +//$Id: NumberGuessTest.java,v 1.6 2006/10/25 23:30:30 gavin Exp $
   package org.jboss.seam.example.numberguess.test;
   
   import org.jboss.seam.Component;
  @@ -11,21 +11,17 @@
   public class NumberGuessTest extends SeamTest
   {
      
  +   private int guess;
  +   
      @Test
      public void testNumberGuessWin() throws Exception
      {
  -      String id = new Script()
  -      {
  -
  -         @Override
  -         protected boolean isGetRequest()
  +      String id = new NonFacesRequest("/numberGuess.jspx")
            {
  -            return true;
  -         }
   
            @Override
            protected void renderResponse() throws Exception {
  -            NumberGuess ng = (NumberGuess) Component.getInstance(NumberGuess.class, true);
  +            NumberGuess ng = (NumberGuess) Component.getInstance(NumberGuess.class);
               assert ng.getMaxGuesses()==10;
               assert ng.getBiggest()==100;
               assert ng.getSmallest()==1;
  @@ -38,15 +34,12 @@
            
         }.run();
   
  -      new Script(id)
  +      String id2 = new FacesRequest("/numberGuess.jspx", id)
         {
            
  -         NumberGuess ng;
  -         int guess;
  -
            @Override
            protected void applyRequestValues() throws Exception {
  -            ng = (NumberGuess) Component.getInstance(NumberGuess.class, true);
  +            NumberGuess ng = (NumberGuess) Component.getInstance(NumberGuess.class);
               guess = ng.getRandomNumber() > 50 ? 25 : 75;
               ng.setCurrentGuess(guess);
            }
  @@ -58,7 +51,21 @@
            }
   
            @Override
  +         protected void afterRequest(boolean skippedRender, String viewId) {
  +            assert skippedRender;
  +            assert "/numberGuess.jspx".equals(viewId);
  +         }
  +         
  +      }.run();
  +      
  +      assert id2.equals(id);
  +      
  +      new NonFacesRequest("/numberGuess.jspx", id)
  +      {
  +         
  +         @Override
            protected void renderResponse() throws Exception {
  +            NumberGuess ng = (NumberGuess) Component.getInstance(NumberGuess.class);
               assert ng.getMaxGuesses()==10;
               assert ( guess > ng.getRandomNumber() && ng.getBiggest()==guess-1 ) 
                     || ( guess < ng.getRandomNumber() && ng.getSmallest()==guess+1 );
  @@ -74,14 +81,12 @@
            
         }.run();
   
  -      new Script(id)
  +      id2 = new FacesRequest("/numberGuess.jspx", id)
         {
            
  -         NumberGuess ng;
  -
            @Override
            protected void applyRequestValues() throws Exception {
  -            ng = (NumberGuess) Component.getInstance(NumberGuess.class, true);
  +            NumberGuess ng = (NumberGuess) Component.getInstance(NumberGuess.class);
               ng.setCurrentGuess( ng.getRandomNumber() );
            }
   
  @@ -92,7 +97,21 @@
            }
   
            @Override
  +         protected void afterRequest(boolean skippedRender, String viewId)
  +         {
  +            assert skippedRender;
  +            assert "/win.jspx".equals(viewId);
  +         }
  +         
  +      }.run();
  +      
  +      assert id2.equals(id);
  +      
  +      new NonFacesRequest("/win.jspx", id)
  +      {
  +         @Override
            protected void renderResponse() throws Exception {
  +            NumberGuess ng = (NumberGuess) Component.getInstance(NumberGuess.class);
               assert ng.getMaxGuesses()==10;
               assert ng.isCorrectGuess();
               assert ng.getCurrentGuess()==ng.getRandomNumber();
  @@ -109,18 +128,12 @@
      @Test
      public void testNumberGuessLose() throws Exception
      {
  -      String id = new Script()
  +      String id = new NonFacesRequest("/numberGuess.jspx")
         {
   
            @Override
  -         protected boolean isGetRequest()
  -         {
  -            return true;
  -         }
  -
  -         @Override
            protected void renderResponse() throws Exception {
  -            NumberGuess ng = (NumberGuess) Component.getInstance(NumberGuess.class, true);
  +            NumberGuess ng = (NumberGuess) Component.getInstance(NumberGuess.class);
               assert ng.getMaxGuesses()==10;
               assert ng.getBiggest()==100;
               assert ng.getSmallest()==1;
  @@ -136,15 +149,12 @@
            
            final int count = i;
   
  -         new Script(id)
  +         new FacesRequest("/numberGuess.jspx", id)
            {
               
  -            NumberGuess ng;
  -            int guess;
  -   
               @Override
               protected void applyRequestValues() throws Exception {
  -               ng = (NumberGuess) Component.getInstance(NumberGuess.class, true);
  +               NumberGuess ng = (NumberGuess) Component.getInstance(NumberGuess.class);
                  guess = ng.getRandomNumber() > 50 ? 25+count : 75-count;
                  ng.setCurrentGuess(guess);
               }
  @@ -158,7 +168,20 @@
               }
      
               @Override
  +            protected void afterRequest(boolean skippedRender, String viewId)
  +            {
  +               assert skippedRender;
  +               assert "/numberGuess.jspx".equals(viewId);
  +            }
  +            
  +         }.run();
  +         
  +         new NonFacesRequest("/numberGuess.jspx", id)
  +         {
  +   
  +            @Override
               protected void renderResponse() throws Exception {
  +               NumberGuess ng = (NumberGuess) Component.getInstance(NumberGuess.class);
                  assert ng.getMaxGuesses()==10;
                  assert ( guess > ng.getRandomNumber() && ng.getBiggest()==guess-1 ) 
                        || ( guess < ng.getRandomNumber() && ng.getSmallest()==guess+1 );
  @@ -176,15 +199,12 @@
         
         }
   
  -      new Script(id)
  +      new FacesRequest("/numberGuess.jspx", id)
         {
            
  -         NumberGuess ng;
  -         int guess;
  -
            @Override
            protected void applyRequestValues() throws Exception {
  -            ng = (NumberGuess) Component.getInstance(NumberGuess.class, true);
  +            NumberGuess ng = (NumberGuess) Component.getInstance(NumberGuess.class);
               guess = ng.getRandomNumber() > 50 ? 49 : 51;
               ng.setCurrentGuess(guess);
            }
  @@ -198,7 +218,20 @@
            }
   
            @Override
  +         protected void afterRequest(boolean skippedRender, String viewId)
  +         {
  +            assert skippedRender;
  +            assert "/lose.jspx".equals(viewId);
  +         }
  +         
  +      }.run();
  +
  +      new NonFacesRequest("/lose.jspx", id)
  +      {
  +
  +         @Override
            protected void renderResponse() throws Exception {
  +            NumberGuess ng = (NumberGuess) Component.getInstance(NumberGuess.class);
               assert ng.getMaxGuesses()==10;
               assert ( guess > ng.getRandomNumber() && ng.getBiggest()==guess-1 ) 
                     || ( guess < ng.getRandomNumber() && ng.getSmallest()==guess+1 );
  
  
  



More information about the jboss-cvs-commits mailing list