[jboss-cvs] jboss-seam/examples/blog/src/test ...

[Gavin King]

  User: gavin   
  Date: 06/10/26 09:40:15

  Modified:    examples/blog/src/test  BlogTest.java
  Log:
  update tests
  
  Revision  Changes    Path
  1.11      +23 -36    jboss-seam/examples/blog/src/test/BlogTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BlogTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/blog/src/test/BlogTest.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- BlogTest.java	11 Oct 2006 04:43:41 -0000	1.10
  +++ BlogTest.java	26 Oct 2006 13:40:15 -0000	1.11
  @@ -25,7 +25,7 @@
      public void testPost() throws Exception
      {
         
  -      new Script()
  +      new FacesRequest("/post.xhtml")
         {
   
            @Override
  @@ -42,19 +42,21 @@
            {
               PostAction action = (PostAction) Component.getInstance(PostAction.class);
               assert action.post().equals("/index.xhtml");
  +            setOutcome("/index.xhtml");
            }
            
  -      }.run();
  -
  -      new Script()
  -      {
  -
            @Override
  -         protected boolean isGetRequest()
  +         protected void afterRequest()
            {
  -            return true;
  +            assert isInvokeApplicationComplete();
  +            assert !isRenderResponseBegun();
            }
   
  +      }.run();
  +
  +      new NonFacesRequest("/index.xhtml")
  +      {
  +
            @Override
            protected void renderResponse() throws Exception
            {
  @@ -68,7 +70,7 @@
   
         }.run();
         
  -      new Script()
  +      new FacesRequest()
         {
            @Override
            protected void invokeApplication() throws Exception
  @@ -82,14 +84,8 @@
      @Test
      public void testLatest() throws Exception
      {
  -      new Script()
  -      {
  -
  -         @Override
  -         protected boolean isGetRequest()
  +      new NonFacesRequest("/index.xhtml")
            {
  -            return true;
  -         }
   
            @Override
            protected void renderResponse() throws Exception
  @@ -103,24 +99,18 @@
      @Test
      public void testEntry() throws Exception
      {
  -      new Script()
  +      new NonFacesRequest(/*"/entry.xhtml"*/)
         {
            
            @Override
  -         protected void setup()
  +         protected void beforeRequest()
            {
               getParameters().put("blogEntryId", new String[] {"i18n"});
            }
   
  +         //temp because page actions cannot be tested
            @Override
  -         protected boolean isGetRequest()
  -         {
  -            return true;
  -         }
  -
  -         //TODO: workaround for the fact that page actions don't get called!
  -         @Override
  -         protected void invokeApplication() throws Exception
  +         protected void callPageActions() throws Exception
            {
               ( (EntryAction) Component.getInstance(EntryAction.class, true) ).loadBlogEntry("i18n");
            }
  @@ -139,7 +129,7 @@
      @Test
      public void testSearch() throws Exception
      {
  -      String id = new Script()
  +      String id = new FacesRequest()
         {
            
            @Override
  @@ -155,23 +145,20 @@
            }
   
            @Override
  -         protected void renderResponse() { assert false; }
  +         protected void afterRequest()
  +         {
  +            assert !isRenderResponseBegun();
  +         }
            
         }.run();
   
  -      new Script(id)
  -      {
  -                  
  -         @Override
  -         protected boolean isGetRequest()
  +      new NonFacesRequest("/search.xhtml", id)
            {
  -            return true;
  -         }
   
            @Override
            protected void renderResponse() throws Exception
            {
  -            ( (SearchService) Component.getInstance(SearchService.class) ).setSearchPattern("seam");
  +            ( (SearchService) Component.getInstance(SearchService.class) ).setSearchPattern("seam"); //temp because page parameters cannot be tested
               List<BlogEntry> results = (List<BlogEntry>) Component.getInstance("searchResults");
               assert results.size()==1;
            }