[csms-cvs] csms-core/src/test/src/org/fanfoot/db TestPlayers.java,1.1,1.2

[<rga...@us...>]

Update of /cvsroot/csms/csms-core/src/test/src/org/fanfoot/db
In directory sc8-pr-cvs1:/tmp/cvs-serv15946

Modified Files:
	TestPlayers.java 
Log Message:
Changed to test use of new database classes

Index: TestPlayers.java
===================================================================
RCS file: /cvsroot/csms/csms-core/src/test/src/org/fanfoot/db/TestPlayers.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestPlayers.java	10 Nov 2002 15:00:28 -0000	1.1
--- TestPlayers.java	21 Nov 2002 21:58:37 -0000	1.2
***************
*** 9,12 ****
--- 9,13 ----
  import org.custommonkey.xmlunit.XMLTestCase;
  import org.custommonkey.xmlunit.XMLUnit;
+ import org.fanfoot.Data4Tests;
  import org.w3c.dom.Node;
  
***************
*** 21,26 ****
    /**  A non valid player ID */
    protected String invalidPlayerID = "Not a valid plaer ID";
-   /**  A valid player ID */
-   protected String validPlayerID = "100";
    /**  A non valid game ID */
    protected String invalidGameID = "Not a valid game ID";
--- 22,25 ----
***************
*** 49,53 ****
      XMLUnit.setIgnoreWhitespace( true );
      try {
!       varPlayers = new org.fanfoot.db.Players();
      } catch ( DBException dbe ) {
        dbe.printStackTrace();
--- 48,54 ----
      XMLUnit.setIgnoreWhitespace( true );
      try {
!       Data4Tests data = new Data4Tests();
!       data.createPlayerCollection();
!       varPlayers = new org.fanfoot.db.Players( Data4Tests.DB_URI );
      } catch ( DBException dbe ) {
        dbe.printStackTrace();
***************
*** 57,109 ****
  
  
!   /**
!    *  Method for testing how works original method:
!    *  org.w3c.dom.Element getPlayer(int) from tested class
!    */
!   public void testGetPlayer() {
      Node player = null;
      try {
        player = varPlayers.getPlayer( invalidPlayerID );
      } catch ( DBException dbe ) {
!       String strMessage = DBException.UNRECOGNISED_ID_MESSAGE + invalidPlayerID;
!       assertEquals( "Should have thrown '" + strMessage + "' exception",
!         strMessage, dbe.getMessage() );
!     }
!     try {
!       player = varPlayers.getPlayer( validPlayerID );
!     } catch ( DBException dbe ) {
!       fail( "Threw exception getting valid player: " + dbe.getMessage() );
      }
-     assertNotNull( "We should have a player with the id 100", player );
    }
  
- 
-   public void testGetPlayerStats() {
-     Node playerEvents = null;
-     try {
-       playerEvents = varPlayers.getPlayerScoringEvents( invalidPlayerID, invalidGameID );
-     } catch ( DBException dbe ) {
-       String strMessage = DBException.UNRECOGNISED_ID_MESSAGE + invalidPlayerID;
-       assertEquals( "Should have thrown '" + strMessage + "' exception",
-         strMessage, dbe.getMessage() );
-     }
-     assertNull( "Should not have any Scoring events", playerEvents );
- 
-     try {
-       playerEvents = varPlayers.getPlayerScoringEvents( validPlayerID, invalidGameID );
-     } catch ( DBException dbe ) {
-       dbe.printStackTrace();
-       fail( "Should not have thrown DBException" );
-     }
-     assertNull( "Should not have any Scoring events", playerEvents );
- 
-     try {
-       playerEvents = varPlayers.getPlayerScoringEvents( validPlayerID, validGameID );
-     } catch ( DBException dbe ) {
-       dbe.printStackTrace();
-       fail( "Should not have thrown DBException." );
-     }
-     assertNotNull( "Should have Scoring events", playerEvents );
-   }
  
  
--- 58,82 ----
  
  
! 
!   public void testAddAndGetPlayer() {
      Node player = null;
+     String strID1 = "100";
+     String strID2 = "101";
      try {
        player = varPlayers.getPlayer( invalidPlayerID );
+       assertNull( "Should not have a player with ID " + invalidPlayerID, player );
+       varPlayers.addPlayer( "firstname", "surname", "regTeam", "team", "Goalkeeper" );
+       player = varPlayers.getPlayer( strID1 );
+       assertNotNull( "Should have a player with ID " + strID1, player );
+       varPlayers.addPlayer( "firstname", "surname", "regTeam", "team", "Goalkeeper" );
+       player = varPlayers.getPlayer( strID1 );
+       assertNotNull( "Should have a player with ID " + strID1, player );
+       player = varPlayers.getPlayer( strID2 );
+       assertNotNull( "Should have a player with ID " + strID2, player );
      } catch ( DBException dbe ) {
!       fail( "Threw exception adding a player: " + dbe.getMessage() );
      }
    }