From: Astrid S. <ast...@us...> - 2008-01-14 22:16:29
|
Update of /cvsroot/arianne/stendhal/tests/utilities In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv18615/tests/utilities Modified Files: PrivateTextMockingTestPlayer.java SpeakerNPCTestHelper.java PlayerTestHelper.java Log Message: reverting changes marriage test still fails Index: PrivateTextMockingTestPlayer.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/utilities/PrivateTextMockingTestPlayer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PrivateTextMockingTestPlayer.java 14 Jan 2008 13:45:37 -0000 1.3 --- PrivateTextMockingTestPlayer.java 14 Jan 2008 22:16:25 -0000 1.4 *************** *** 11,18 **** private StringBuilder privateTextBuffer = null; - @Override - protected void registerTheNewNameInTheConversationParserWordList(String newName, String oldName) { - ; - } /** --- 11,14 ---- Index: PlayerTestHelper.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/utilities/PlayerTestHelper.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** PlayerTestHelper.java 14 Jan 2008 14:50:41 -0000 1.25 --- PlayerTestHelper.java 14 Jan 2008 22:16:25 -0000 1.26 *************** *** 32,40 **** PlayerTestHelper.generatePlayerRPClasses(); Player pl = new Player(new RPObject() { ! }) { ! @Override ! protected void registerTheNewNameInTheConversationParserWordList(String newName, String oldName) { ! } ! }; PlayerTestHelper.addEmptySlots(pl); pl.setName(name); --- 32,36 ---- PlayerTestHelper.generatePlayerRPClasses(); Player pl = new Player(new RPObject() { ! }); PlayerTestHelper.addEmptySlots(pl); pl.setName(name); Index: SpeakerNPCTestHelper.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/utilities/SpeakerNPCTestHelper.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SpeakerNPCTestHelper.java 14 Jan 2008 14:39:46 -0000 1.6 --- SpeakerNPCTestHelper.java 14 Jan 2008 22:16:25 -0000 1.7 *************** *** 19,25 **** PlayerTestHelper.generateNPCRPClasses(); return new SpeakerNPC(name) { ! @Override ! protected void registerTheNewNameInTheConversationParserWordList(String newName, String oldName) { ! } }; } --- 19,23 ---- PlayerTestHelper.generateNPCRPClasses(); return new SpeakerNPC(name) { ! }; } |