[Arianne-commits] stendhal/tests/games/stendhal/server/core/account CharacterCreatorTest.java, 1.7, 1.8

[Astrid S. <ast...@us...>]

Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/core/account
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv9059/tests/games/stendhal/server/core/account

Modified Files:
	CharacterCreatorTest.java 
Log Message:
at least it works

Index: CharacterCreatorTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/core/account/CharacterCreatorTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CharacterCreatorTest.java	31 Dec 2007 15:32:39 -0000	1.7
--- CharacterCreatorTest.java	31 Dec 2007 16:09:04 -0000	1.8
***************
*** 2,6 ****
  
  import static org.junit.Assert.assertEquals;
! 
  import java.sql.SQLException;
  
--- 2,6 ----
  
  import static org.junit.Assert.assertEquals;
! import static org.junit.Assert.assertTrue;
  import java.sql.SQLException;
  
***************
*** 27,52 ****
  	@Test
  	public void testCreate() {
! 		try {
  			Transaction trans = DatabaseFactory.getDatabase().getTransaction();
! 
! 			if (!DatabaseFactory.getDatabase().getCharacters(trans, "user").isEmpty()) {
! 
! 				DatabaseFactory.getDatabase().removeCharacter(trans, "user", "char");
! 
  			}
  			CharacterCreator cc = new CharacterCreator("user", "char", null);
- 
  			assertEquals(Result.OK_CREATED, cc.create().getResult());
  			assertEquals(Result.FAILED_PLAYER_EXISTS, cc.create().getResult());
- 			if (!DatabaseFactory.getDatabase().getCharacters(trans, "user").isEmpty()) {
- 
- 				DatabaseFactory.getDatabase().removeCharacter(trans, "user", "char");
  
  			}
! 		} catch (NoDatabaseConfException e) {
! 			e.printStackTrace();
! 		} catch (SQLException e) {
! 			e.printStackTrace();
! 		}
  	}
  
--- 27,61 ----
  	@Test
  	public void testCreate() {
! 		
  			Transaction trans = DatabaseFactory.getDatabase().getTransaction();
! 			try {
! 				trans.getAccessor().execute("DELETE FROM character_stats where name='char';");
! 				trans.getAccessor().execute("DELETE rpobject , characters from rpobject , characters where characters.charname = \"char\" and characters.object_id = rpobject.object_id;");
! 				
! 				
! 			} catch (NoDatabaseConfException e) {
! 				
! 				e.printStackTrace();
! 			} catch (SQLException e) {
! 				
! 				e.printStackTrace();
  			}
  			CharacterCreator cc = new CharacterCreator("user", "char", null);
  			assertEquals(Result.OK_CREATED, cc.create().getResult());
  			assertEquals(Result.FAILED_PLAYER_EXISTS, cc.create().getResult());
  
+ 			try {
+ 				trans.getAccessor().execute("DELETE FROM character_stats where name='char';");
+ 				trans.getAccessor().execute("DELETE rpobject , characters from rpobject , characters where characters.charname = \"char\" and characters.object_id = rpobject.object_id;");
+ 				
+ 				
+ 			} catch (NoDatabaseConfException e) {
+ 				
+ 				e.printStackTrace();
+ 			} catch (SQLException e) {
+ 				
+ 				e.printStackTrace();
  			}
! 		
  	}