[Arianne-commits] marauroa/src/marauroa/test FailedException.java, NONE, 1.1 Test.java, NONE, 1.1 TestClient.java, 1.1, 1.2 TestRPRuleProcessor.java, 1.3, 1.4

[Miguel A. B. L. <ari...@us...>]

Update of /cvsroot/arianne/marauroa/src/marauroa/test
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv14767/src/marauroa/test

Modified Files:
	TestClient.java TestRPRuleProcessor.java 
Added Files:
	FailedException.java Test.java 
Log Message:
On the middle of writting the system test

Index: TestRPRuleProcessor.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/test/TestRPRuleProcessor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestRPRuleProcessor.java	4 Mar 2007 19:30:57 -0000	1.3
--- TestRPRuleProcessor.java	4 Mar 2007 21:13:19 -0000	1.4
***************
*** 1,6 ****
--- 1,9 ----
  package marauroa.test;
  
+ import java.io.IOException;
+ import java.sql.SQLException;
  import java.util.List;
  
+ import marauroa.common.crypto.Hash;
  import marauroa.common.game.RPAction;
  import marauroa.common.game.RPObject;
***************
*** 8,11 ****
--- 11,18 ----
  import marauroa.common.game.RPObjectNotFoundException;
  import marauroa.server.game.AccountResult;
+ import marauroa.server.game.AccountResult.Result;
+ import marauroa.server.game.db.DatabaseFactory;
+ import marauroa.server.game.db.IDatabase;
+ import marauroa.server.game.db.Transaction;
  import marauroa.server.game.rp.IRPRuleProcessor;
  import marauroa.server.game.rp.RPServerManager;
***************
*** 13,16 ****
--- 20,29 ----
  public class TestRPRuleProcessor implements IRPRuleProcessor{
  
+ 	private IDatabase db;
+ 	
+ 	public TestRPRuleProcessor() {
+ 		db=DatabaseFactory.getDatabase();
+ 	}
+ 
  	private static TestRPRuleProcessor rules;
  	
***************
*** 36,46 ****
  
  	public boolean checkGameVersion(String game, String version) {
! 		// TODO Auto-generated method stub
! 		return false;
  	}
  
  	public AccountResult createAccount(String username, String password, String email, RPObject template) {
! 		// TODO Auto-generated method stub
! 		return null;
  	}
  
--- 49,77 ----
  
  	public boolean checkGameVersion(String game, String version) {
! 		Test.assertEquals("TestFramework", game);
! 		Test.assertEquals("0.00", version);
! 		
! 		return game.equals("TestFramework") && version.equals("0.00");		
  	}
  
  	public AccountResult createAccount(String username, String password, String email, RPObject template) {
! 		Transaction trans=db.getTransaction();
! 		try {
! 			trans.begin();
! 
! 			if(db.hasPlayer(trans,username)) {
! 				return new AccountResult(Result.FAILED_PLAYER_EXISTS, username, null);
! 			}
! 			
! 			db.addPlayer(trans, username, Hash.hash(password), email);
! 			db.addCharacter(trans, username, username, template);
! 			
! 			return null;
! 		} catch(SQLException e) {
! 			Test.fail();
! 			return new AccountResult(Result.FAILED_EXCEPTION, username, null);
! 		} catch (IOException e) {
! 			throw new IllegalArgumentException();
! 		}
  	}
  

--- NEW FILE: Test.java ---
package marauroa.test;

public class Test {

	public static void assertEquals(Object expected, Object val) {
		if(!expected.equals(val)) {
			throw new FailedException("expected "+expected+" but got "+val);
		}
	}

	public static void fail() {
		throw new FailedException("Forced fail.");
	}

}

--- NEW FILE: FailedException.java ---
package marauroa.test;

public class FailedException extends RuntimeException {

	/**
	 * 
	 */
	private static final long serialVersionUID = 1L;

	public FailedException(String string) {
		super(string);	
	}
}

Index: TestClient.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/test/TestClient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestClient.java	4 Mar 2007 13:44:31 -0000	1.1
--- TestClient.java	4 Mar 2007 21:13:19 -0000	1.2
***************
*** 11,27 ****
  	public TestClient(String loggingProperties) {
  		super(loggingProperties);
- 		// TODO Auto-generated constructor stub
  	}
  
  	@Override
  	protected String getGameName() {
! 		// TODO Auto-generated method stub
! 		return null;
  	}
  
  	@Override
  	protected String getVersionNumber() {
! 		// TODO Auto-generated method stub
! 		return null;
  	}
  
--- 11,24 ----
  	public TestClient(String loggingProperties) {
  		super(loggingProperties);
  	}
  
  	@Override
  	protected String getGameName() {
! 		return "TestFramework";
  	}
  
  	@Override
  	protected String getVersionNumber() {
! 		return "0.00";
  	}