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

Peter Muir peter at bleepbleep.org.uk
Mon Oct 8 10:53:38 EDT 2007


  User: pmuir   
  Date: 07/10/08 10:53:38

  Modified:    examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test      
                        EditArtistTest.java DisplayDiscTest.java
                        LoginTest.java TestStrings.java
                        DisplayArtistTest.java EditDiscTest.java
  Log:
  Finish off seamdiscs tests
  
  Revision  Changes    Path
  1.2       +61 -28    jboss-seam/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/EditArtistTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EditArtistTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/EditArtistTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- EditArtistTest.java	8 Oct 2007 11:48:37 -0000	1.1
  +++ EditArtistTest.java	8 Oct 2007 14:53:38 -0000	1.2
  @@ -3,8 +3,23 @@
    */
   package org.jboss.seam.example.seamdiscs.test;
   
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.ARTIST1_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.ARTIST4_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.ARTIST_NEW_DESCRIPTION;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.BANDMEMBER3_VALUE;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.NEW_ARTIST_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.NEW_BANDMEMBER_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.NEW_BAND_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.PASSWORD;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.PERSISTED;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.UPDATED;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.USERNAME;
  +
  +import java.util.List;
  +
   import javax.el.PropertyNotFoundException;
   
  +import org.jboss.seam.example.seamdiscs.model.BandMember;
   import org.jboss.seam.mock.DBUnitSeamTest;
   import org.testng.annotations.Test;
   
  @@ -12,12 +27,14 @@
    * @author Pete Muir
    *
    */
  -public class EditArtistTest extends DBUnitSeamTest{
  +public class EditArtistTest extends DBUnitSeamTest
  +{
  +    
       
  -    private static final String NEW_DESCRIPTION_1 = "A great band";
   
       @Override
  -    protected void prepareDBUnitOperations() {
  +    protected void prepareDBUnitOperations() 
  +    {
           beforeTestOperations.add(
                   new DataSetOperation("org/jboss/seam/example/seamdiscs/test/BaseData.xml")
           );
  @@ -37,8 +54,8 @@
               
               @Override
               protected void updateModelValues() throws Exception {
  -                setValue("#{identity.username}", "administrator");
  -                setValue("#{identity.password}", "administrator");
  +                setValue("#{identity.username}", USERNAME);
  +                setValue("#{identity.password}", PASSWORD);
               }
               
               @Override
  @@ -52,7 +69,7 @@
               {
                   assert (Boolean) getValue("#{identity.loggedIn}");
                   assert ((Integer) 1).equals(getValue("#{artistHome.id}"));
  -                assert "Pink Floyd".equals(getValue("#{artist.name}"));
  +                assert ARTIST1_NAME.equals(getValue("#{artist.name}"));
                   assert getValue("#{artist.description}") == null;
                   assert isLongRunningConversation();
                   assert (Boolean) getValue("#{artistHome.managed}");
  @@ -66,7 +83,7 @@
               @Override
               protected void updateModelValues() throws Exception 
               {
  -                setValue("#{artist.description}", NEW_DESCRIPTION_1);
  +                setValue("#{artist.description}", ARTIST_NEW_DESCRIPTION);
                   assert isLongRunningConversation();
                   assert cid.equals(getConversationId());
               }
  @@ -74,13 +91,13 @@
               @Override
               protected void invokeApplication() throws Exception 
               {
  -                assert "updated".equals(invokeAction("#{artistHome.update}"));
  +                assert UPDATED.equals(invokeAction("#{artistHome.update}"));
               }
               
               @Override
               protected void renderResponse() throws Exception 
               {
  -                assert NEW_DESCRIPTION_1.equals(getValue("#{artist.description"));
  +                assert ARTIST_NEW_DESCRIPTION.equals(getValue("#{artist.description"));
                   assert isLongRunningConversation();
               }
               
  @@ -100,8 +117,8 @@
               
               @Override
               protected void updateModelValues() throws Exception {
  -                setValue("#{identity.username}", "administrator");
  -                setValue("#{identity.password}", "administrator");
  +                setValue("#{identity.username}", USERNAME);
  +                setValue("#{identity.password}", PASSWORD);
               }
               
               @Override
  @@ -127,20 +144,20 @@
               @Override
               protected void updateModelValues() throws Exception 
               {
  -                setValue("#{artist.name}", "Pete Muir");
  +                setValue("#{artist.name}", NEW_ARTIST_NAME);
                   assert isLongRunningConversation();
               }
               
               @Override
               protected void invokeApplication() throws Exception 
               {
  -                assert "persisted".equals(invokeAction("#{artistHome.persist}"));
  +                assert PERSISTED.equals(invokeAction("#{artistHome.persist}"));
               }
               
               @Override
               protected void renderResponse() throws Exception 
               {
  -                assert "Pete Muir".equals(getValue("#{artist.name}"));
  +                assert NEW_ARTIST_NAME.equals(getValue("#{artist.name}"));
               }
               
           }.run();
  @@ -152,8 +169,8 @@
               protected void renderResponse() throws Exception 
               {
                   assert new Long("7").equals(getValue("#{artists.resultCount}"));
  -                assert "Pete Muir".equals(getValue("#{artists.resultList[3].name}"));
  -                assert "Led Zepplin".equals(getValue("#{artists.resultList[4].name}"));
  +                assert NEW_ARTIST_NAME.equals(getValue("#{artists.resultList[3].name}"));
  +                assert ARTIST4_NAME.equals(getValue("#{artists.resultList[4].name}"));
               }
               
           }.run();        
  @@ -173,8 +190,8 @@
               
               @Override
               protected void updateModelValues() throws Exception {
  -                setValue("#{identity.username}", "administrator");
  -                setValue("#{identity.password}", "administrator");
  +                setValue("#{identity.username}", USERNAME);
  +                setValue("#{identity.password}", PASSWORD);
                   setValue("#{artistHome.type}", "band");
               }
               
  @@ -209,20 +226,20 @@
               @Override
               protected void updateModelValues() throws Exception 
               {
  -                setValue("#{artist.name}", "Pete Muir's Band");
  +                setValue("#{artist.name}", NEW_BAND_NAME);
                   assert isLongRunningConversation();
               }
               
               @Override
               protected void invokeApplication() throws Exception 
               {
  -                assert "persisted".equals(invokeAction("#{artistHome.persist}"));
  +                assert PERSISTED.equals(invokeAction("#{artistHome.persist}"));
               }
               
               @Override
               protected void renderResponse() throws Exception 
               {
  -                assert "Pete Muir's Band".equals(getValue("#{artist.name}"));
  +                assert NEW_BAND_NAME.equals(getValue("#{artist.name}"));
                   assert ((Integer) 0).equals("#{artist.bandMembers.size}");
               }
               
  @@ -235,8 +252,8 @@
               protected void renderResponse() throws Exception 
               {
                   assert new Long("7").equals(getValue("#{artists.resultCount}"));
  -                assert "Pete Muir's Band".equals(getValue("#{artists.resultList[3].name}"));
  -                assert "Led Zepplin".equals(getValue("#{artists.resultList[4].name}"));
  +                assert NEW_BAND_NAME.equals(getValue("#{artists.resultList[3].name}"));
  +                assert ARTIST4_NAME.equals(getValue("#{artists.resultList[4].name}"));
               }
               
           }.run();
  @@ -256,8 +273,8 @@
               
               @Override
               protected void updateModelValues() throws Exception {
  -                setValue("#{identity.username}", "administrator");
  -                setValue("#{identity.password}", "administrator");
  +                setValue("#{identity.username}", USERNAME);
  +                setValue("#{identity.password}", PASSWORD);
               }
               
               @Override
  @@ -269,7 +286,7 @@
               @Override
               protected void renderResponse() throws Exception 
               {
  -                assert "Pink Floyd".equals(getValue("#{artist.name}"));
  +                assert ARTIST1_NAME.equals(getValue("#{artist.name}"));
                   assert ((Integer) 3).equals(getValue("#{artist.bandMembers.size}"));
               }
           }.run();
  @@ -297,7 +314,7 @@
               @Override
               protected void updateModelValues() throws Exception 
               {
  -                setValue("#{artist.bandMembers[3].name}", "Pete Muir");
  +                setValue("#{artist.bandMembers[3].name}", NEW_BANDMEMBER_NAME);
               }
               
               @Override
  @@ -310,11 +327,27 @@
               protected void renderResponse() throws Exception 
               {
                   assert ((Integer) 4).equals(getValue("#{artist.size}"));
  -                assert "Pete Muir".equals(getValue("#{artist.bandMembers[3].name}"));
  +                assert NEW_BANDMEMBER_NAME.equals(getValue("#{artist.bandMembers[3].name}"));
               }
               
           }.run();
   
       }
       
  +    @Test
  +    public void testBandMemberFinder() throws Exception
  +    {
  +        new NonFacesRequest("/artist.xhtml")
  +        {
  +            
  +            @Override
  +            protected void renderResponse() throws Exception 
  +            {
  +                List<BandMember> bandMembers = (List<BandMember>) invokeMethod("#{bandMemberFinder.getBandMembers('R')}");
  +                assert bandMembers.size() == 1;
  +                assert BANDMEMBER3_VALUE.equals(bandMembers.get(0).getName());
  +            }
  +            
  +        }.run();
  +    }
   }
  
  
  
  1.2       +21 -7     jboss-seam/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/DisplayDiscTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DisplayDiscTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/DisplayDiscTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- DisplayDiscTest.java	8 Oct 2007 11:48:37 -0000	1.1
  +++ DisplayDiscTest.java	8 Oct 2007 14:53:38 -0000	1.2
  @@ -1,11 +1,25 @@
   package org.jboss.seam.example.seamdiscs.test;
   
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.DISC1_ARTIST;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.DISC1_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.DISC2_ARTIST;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.DISC2_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.DISC3_ARTIST;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.DISC3_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.DISC4_ARTIST;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.DISC4_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.DISC5_ARTIST;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.DISC5_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.DISC6_ARTIST;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.DISC6_NAME;
  +
   import javax.faces.model.DataModel;
   
   import org.jboss.seam.example.seamdiscs.model.Disc;
   import org.jboss.seam.mock.DBUnitSeamTest;
   import org.testng.annotations.Test;
   
  +
   public class DisplayDiscTest extends DBUnitSeamTest
   {
       
  @@ -33,12 +47,12 @@
                   assert dataModel.getRowCount() == 6;
                   
                   // Check for correct ordering
  -                assertDisc(dataModel, 0, "Blood on the Tracks", "Bob Dylan");
  -                assertDisc(dataModel, 1, "Chavez Ravine", "Ry Cooder");
  -                assertDisc(dataModel, 2, "Dark Side of the Moon", "Pink Floyd");
  -                assertDisc(dataModel, 3, "Liege and Lief", "Fairport Convention");
  -                assertDisc(dataModel, 4, "The Freewheelin' Bob Dylan", "Bob Dylan");
  -                assertDisc(dataModel, 5, "The Wall", "Pink Floyd");
  +                assertDisc(dataModel, 0, DISC5_NAME, DISC5_ARTIST);
  +                assertDisc(dataModel, 1, DISC6_NAME, DISC6_ARTIST);
  +                assertDisc(dataModel, 2, DISC1_NAME, DISC1_ARTIST);
  +                assertDisc(dataModel, 3, DISC2_NAME, DISC2_ARTIST);
  +                assertDisc(dataModel, 4, DISC4_NAME, DISC4_ARTIST);
  +                assertDisc(dataModel, 5, DISC3_NAME, DISC3_ARTIST);
               }
               
           }.run();
  @@ -65,7 +79,7 @@
                   object = getValue("#{disc}");
                   assert object instanceof Disc;
                   Disc disc1 = (Disc) object;
  -                assert "The Wall".equals(disc1.getName());
  +                assert DISC3_NAME.equals(disc1.getName());
               }
           }.run();
       }
  
  
  
  1.2       +4 -4      jboss-seam/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/LoginTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LoginTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/LoginTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- LoginTest.java	8 Oct 2007 11:48:37 -0000	1.1
  +++ LoginTest.java	8 Oct 2007 14:53:38 -0000	1.2
  @@ -1,9 +1,9 @@
  -/**
  - * 
  - */
   package org.jboss.seam.example.seamdiscs.test;
   
  -import static org.jboss.seam.example.seamdiscs.test.TestStrings.*;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.PASSWORD;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.USERNAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.WRONG_PASSWORD;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.WRONG_USERNAME;
   
   import org.jboss.seam.mock.DBUnitSeamTest;
   import org.testng.annotations.Test;
  
  
  
  1.2       +35 -1     jboss-seam/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/TestStrings.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TestStrings.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/TestStrings.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- TestStrings.java	8 Oct 2007 11:48:37 -0000	1.1
  +++ TestStrings.java	8 Oct 2007 14:53:38 -0000	1.2
  @@ -14,7 +14,41 @@
       public static final String WRONG_USERNAME = "wrongUsername";
       public static final String WRONG_PASSWORD = "wrongPassword";
       
  +    
  +    public static final String ARTIST1_NAME = "Pink Floyd";
  +    public static final String ARTIST2_NAME = "Fairport Convention";
  +    public static final String ARTIST3_NAME = "Bob Dylan";
  +    public static final String ARTIST4_NAME = "Led Zepplin";
  +    public static final String ARTIST5_NAME = "Ry Cooder";
  +    public static final String ARTIST6_NAME = "Richard Thompson";
  +    public static final String ARTIST_NEW_DESCRIPTION = "A great band";
  +    public static final String NEW_ARTIST_NAME = "Pete Muir";
  +    
  +    
  +    
  +    public static final String NEW_DISC_NAME = "Pete Muir's Debut Album";
  +    public static final String DISC1_NAME = "Dark Side of the Moon";
  +    public static final String DISC1_ARTIST = ARTIST1_NAME;
  +    public static final String DISC2_NAME = "Liege and Lief";
  +    public static final String DISC2_ARTIST = ARTIST2_NAME;
  +    public static final String DISC3_NAME = "The Wall";
  +    public static final String DISC3_ARTIST = ARTIST1_NAME;
       public static final String DISC4_NAME = "The Freewheelin' Bob Dylan";
  +    public static final String DISC4_ARTIST = ARTIST3_NAME;
       public static final String DISC4_NEW_DESCRIPTION = "A classic album";
  -    public static final String NEW_DISC_NAME = "Pete Muir's Debut Album";
  +    public static final String DISC5_NAME = "Blood on the Tracks";
  +    public static final String DISC5_ARTIST = ARTIST3_NAME;
  +    public static final String DISC6_NAME = "Chavez Ravine";
  +    public static final String DISC6_ARTIST = ARTIST5_NAME;
  +    
  +    public static final String NEW_BAND_NAME = "Pete Muir's Band";
  +    public static final String NEW_BANDMEMBER_NAME = "Gavin King";
  +    public static final String BANDMEMBER3_VALUE = "Roger Waters";
  +    
  +    public static final String PERSISTED = "persisted";
  +    public static final String UPDATED = "updated";
  +    
  +    
  +    
  +    
   }
  
  
  
  1.2       +78 -15    jboss-seam/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/DisplayArtistTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DisplayArtistTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/DisplayArtistTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- DisplayArtistTest.java	8 Oct 2007 11:48:37 -0000	1.1
  +++ DisplayArtistTest.java	8 Oct 2007 14:53:38 -0000	1.2
  @@ -1,5 +1,12 @@
   package org.jboss.seam.example.seamdiscs.test;
   
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.ARTIST1_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.ARTIST2_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.ARTIST3_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.ARTIST4_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.ARTIST5_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.ARTIST6_NAME;
  +
   import java.util.ArrayList;
   import java.util.List;
   
  @@ -12,6 +19,7 @@
   import org.jboss.seam.mock.DBUnitSeamTest;
   import org.testng.annotations.Test;
   
  +
   public class DisplayArtistTest extends DBUnitSeamTest
   {
       
  @@ -25,7 +33,7 @@
       @Test
       public void testDisplayArtists() throws Exception
       {
  -        new FacesRequest("/artists.xhtml")
  +        new NonFacesRequest("/artists.xhtml")
           {
               
               @Override
  @@ -39,24 +47,79 @@
                   assert artistsDataModel.getRowCount() == 6;
                   
                   // Check for correct ordering
  -                assertArtist(artistsDataModel, 0, "Ry Cooder");
  -                assertArtist(artistsDataModel, 1, "Richard Thompson");
  -                assertArtist(artistsDataModel, 2, "Pink Floyd");
  -                assertArtist(artistsDataModel, 3, "Led Zepplin");
  -                assertArtist(artistsDataModel, 4, "Fairport Convention");
  -                assertArtist(artistsDataModel, 5, "Bob Dylan");
  +                assertArtist(artistsDataModel, 0, ARTIST5_NAME);
  +                assertArtist(artistsDataModel, 1, ARTIST6_NAME);
  +                assertArtist(artistsDataModel, 2, ARTIST1_NAME);
  +                assertArtist(artistsDataModel, 3, ARTIST4_NAME);
  +                assertArtist(artistsDataModel, 4, ARTIST2_NAME);
  +                assertArtist(artistsDataModel, 5, ARTIST3_NAME);
               }
               
           }.run();
       }
       
       @Test
  -    public void testSeamCollectionModel() throws Exception
  +    public void testFilterArtists() throws Exception
  +    {
  +        new FacesRequest("/artists.xhtml")
  +        {
  +            
  +            @Override
  +            protected void updateModelValues() throws Exception 
  +            {
  +                setValue("#{exampleArtist.name}", "r");
  +            }
  +            
  +            @Override
  +            protected void renderResponse() throws Exception 
       {
  +                Object artists = getValue("#{artists.dataModel}");
  +                assert artists instanceof DataModel;
  +                DataModel artistsDataModel = (DataModel) artists;
  +                
  +                // Check for the correct number of results
  +                assert artistsDataModel.getRowCount() == 2;
  +                
  +                // Check for correct ordering
  +                assertArtist(artistsDataModel, 0, ARTIST5_NAME);
  +                assertArtist(artistsDataModel, 1, ARTIST6_NAME);
  +            }
  +            
  +        }.run();
  +        
           new FacesRequest("/artists.xhtml")
           {
               
               @Override
  +            protected void updateModelValues() throws Exception 
  +            {
  +                setValue("#{exampleArtist.name}", "Ri");
  +            }
  +            
  +            @Override
  +            protected void renderResponse() throws Exception 
  +            {
  +                Object artists = getValue("#{artists.dataModel}");
  +                assert artists instanceof DataModel;
  +                DataModel artistsDataModel = (DataModel) artists;
  +                
  +                // Check for the correct number of results
  +                assert artistsDataModel.getRowCount() == 1;
  +                
  +                // Check for correct ordering
  +                assertArtist(artistsDataModel, 0, ARTIST6_NAME);
  +            }
  +            
  +        }.run();
  +    }
  +    
  +    @Test
  +    public void testSeamCollectionModel() throws Exception
  +    {
  +        new NonFacesRequest("/artists.xhtml")
  +        {
  +            
  +            @Override
               protected void renderResponse() throws Exception 
               {
                   Object artists = getValue("#{artists.dataModel}");
  @@ -69,12 +132,12 @@
                   collectionModel.setSortCriteria(criteria);
                   
                   // Check for correct ordering
  -                assertArtist(collectionModel, 5, "Ry Cooder");
  -                assertArtist(collectionModel, 4, "Richard Thompson");
  -                assertArtist(collectionModel, 3, "Pink Floyd");
  -                assertArtist(collectionModel, 2, "Led Zepplin");
  -                assertArtist(collectionModel, 1, "Fairport Convention");
  -                assertArtist(collectionModel, 0, "Bob Dylan");
  +                assertArtist(collectionModel, 5, ARTIST5_NAME);
  +                assertArtist(collectionModel, 4, ARTIST6_NAME);
  +                assertArtist(collectionModel, 3, ARTIST1_NAME);
  +                assertArtist(collectionModel, 2, ARTIST4_NAME);
  +                assertArtist(collectionModel, 1, ARTIST2_NAME);
  +                assertArtist(collectionModel, 0, ARTIST3_NAME);
               }
               
           }.run();
  @@ -101,7 +164,7 @@
                   object = getValue("#{artist}");
                   assert object instanceof Band;
                   Band artist1 = (Band) object;
  -                assert "Pink Floyd".equals(artist1.getName());
  +                assert ARTIST1_NAME.equals(artist1.getName());
                   assert artist1.getBandMembers().size() == 3;
               }
           }.run();
  
  
  
  1.2       +14 -3     jboss-seam/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/EditDiscTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EditDiscTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/test/EditDiscTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- EditDiscTest.java	8 Oct 2007 11:48:37 -0000	1.1
  +++ EditDiscTest.java	8 Oct 2007 14:53:38 -0000	1.2
  @@ -3,11 +3,17 @@
    */
   package org.jboss.seam.example.seamdiscs.test;
   
  -import javax.el.PropertyNotFoundException;
  -import javax.faces.model.DataModel;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.ARTIST6_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.DISC4_ARTIST;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.DISC4_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.DISC4_NEW_DESCRIPTION;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.NEW_DISC_NAME;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.PASSWORD;
  +import static org.jboss.seam.example.seamdiscs.test.TestStrings.USERNAME;
   
  -import static org.jboss.seam.example.seamdiscs.test.TestStrings.*;
  +import javax.faces.model.DataModel;
   
  +import org.jboss.seam.example.seamdiscs.model.Artist;
   import org.jboss.seam.example.seamdiscs.model.Disc;
   import org.jboss.seam.mock.DBUnitSeamTest;
   import org.testng.annotations.Test;
  @@ -69,6 +75,10 @@
               protected void updateModelValues() throws Exception 
               {
                   setValue("#{disc.description}", DISC4_NEW_DESCRIPTION);
  +                // Simulate the entity converter
  +                setValue("#{exampleArtist.name}", ARTIST6_NAME);
  +                Artist artist = (Artist) getValue("#{artists.singleResult}");
  +                setValue("#{disc.artist}", artist);
                   assert isLongRunningConversation();
                   assert cid.equals(getConversationId());
               }
  @@ -83,6 +93,7 @@
               protected void renderResponse() throws Exception 
               {
                   assert DISC4_NEW_DESCRIPTION.equals(getValue("#{disc.description"));
  +                assert DISC4_ARTIST.equals(getValue("#{disc.artist.name}"));
                   assert isLongRunningConversation();
               }
               
  
  
  



More information about the jboss-cvs-commits mailing list