From: Martin F. <mar...@us...> - 2008-01-05 22:19:23
|
Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/entity/npc/parser In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv18598/tests/games/stendhal/server/entity/npc/parser Modified Files: SentenceTest.java Log Message: also allow to use ignored words in expression type matching ("IGN") Index: SentenceTest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/entity/npc/parser/SentenceTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SentenceTest.java 5 Jan 2008 22:07:05 -0000 1.7 --- SentenceTest.java 5 Jan 2008 22:19:27 -0000 1.8 *************** *** 97,119 **** Sentence s1 = ConversationParser.parse("buy banana"); assertFalse(s1.hasError()); - Sentence m1 = ConversationParser.parseForMatching("buy OBJ"); Sentence m2 = ConversationParser.parseForMatching("buy SUB"); assertFalse(m1.hasError()); assertFalse(m2.hasError()); - assertTrue(s1.matches(m1)); assertFalse(s1.matches(m2)); ! s1 = ConversationParser.parse("make apple pie"); assertFalse(s1.hasError()); - m1 = ConversationParser.parseForMatching("VER *pie"); m2 = ConversationParser.parseForMatching("VER *cookie"); assertFalse(m1.hasError()); assertFalse(m2.hasError()); - assertTrue(s1.matches(m1)); assertFalse(s1.matches(m2)); } --- 97,121 ---- Sentence s1 = ConversationParser.parse("buy banana"); assertFalse(s1.hasError()); Sentence m1 = ConversationParser.parseForMatching("buy OBJ"); Sentence m2 = ConversationParser.parseForMatching("buy SUB"); assertFalse(m1.hasError()); assertFalse(m2.hasError()); assertTrue(s1.matches(m1)); assertFalse(s1.matches(m2)); ! s1 = ConversationParser.parse("bake apple pie"); assertFalse(s1.hasError()); m1 = ConversationParser.parseForMatching("VER *pie"); m2 = ConversationParser.parseForMatching("VER *cookie"); assertFalse(m1.hasError()); assertFalse(m2.hasError()); assertTrue(s1.matches(m1)); assertFalse(s1.matches(m2)); + + s1 = ConversationParser.parse("please work"); + assertFalse(s1.hasError()); + m1 = ConversationParser.parseForMatching("IGN VER"); + assertFalse(m1.hasError()); + assertTrue(s1.matches(m1)); } |