svn commit: r1700493 - in /opennlp/sandbox/nlp-utils/src/test/java/org/apache/opennlp/utils/cfg: ContextFreeGrammarTest.java ProbabilisticContextFreeGrammarTest.java

[tommaso]

Author: tommaso
Date: Tue Sep  1 11:23:51 2015
New Revision: 1700493

URL: http://svn.apache.org/r1700493
Log:
OPENNLP-713 - slightly enhanced some tests

Modified:
    
opennlp/sandbox/nlp-utils/src/test/java/org/apache/opennlp/utils/cfg/ContextFreeGrammarTest.java
    
opennlp/sandbox/nlp-utils/src/test/java/org/apache/opennlp/utils/cfg/ProbabilisticContextFreeGrammarTest.java

Modified: 
opennlp/sandbox/nlp-utils/src/test/java/org/apache/opennlp/utils/cfg/ContextFreeGrammarTest.java
URL: 
http://svn.apache.org/viewvc/opennlp/sandbox/nlp-utils/src/test/java/org/apache/opennlp/utils/cfg/ContextFreeGrammarTest.java?rev=1700493&r1=1700492&r2=1700493&view=diff
==============================================================================
--- 
opennlp/sandbox/nlp-utils/src/test/java/org/apache/opennlp/utils/cfg/ContextFreeGrammarTest.java
 (original)
+++ 
opennlp/sandbox/nlp-utils/src/test/java/org/apache/opennlp/utils/cfg/ContextFreeGrammarTest.java
 Tue Sep  1 11:23:51 2015
@@ -23,8 +23,7 @@ import java.util.LinkedList;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * Testcase for {@link org.apache.opennlp.utils.cfg.ContextFreeGrammar}
@@ -112,6 +111,7 @@ public class ContextFreeGrammarTest {
   public void testSingleSentenceExpansion() throws Exception {
     ContextFreeGrammar contextFreeGrammar = new 
ContextFreeGrammar(nonTerminals, terminals, rules, startSymbol);
     String[] expansion = contextFreeGrammar.leftMostDerivation("S");
+    assertArrayEquals(new String[]{"the", "man", "works"}, expansion);
     checkExpansion(expansion);
   }
 
@@ -127,9 +127,11 @@ public class ContextFreeGrammarTest {
   public void testMultipleSentencesExpansion() throws Exception {
     ContextFreeGrammar contextFreeGrammar = new 
ContextFreeGrammar(nonTerminals, terminals, rules, startSymbol);
     String[] expansion = contextFreeGrammar.leftMostDerivation("S", "CJ", "S");
+    assertArrayEquals(new String[]{"the", "man", "works", "and", "the", "man", 
"works"}, expansion);
     checkExpansion(expansion);
-
     expansion = contextFreeGrammar.leftMostDerivation("S", "DJ", "S", "CJ", 
"P");
+    assertArrayEquals(new String[]{"the", "man", "works", "but", "the", "man", 
"works", "and", "the", "man", "works",
+            "and", "the", "man", "works"}, expansion);
     checkExpansion(expansion);
   }
 
@@ -138,7 +140,6 @@ public class ContextFreeGrammarTest {
     ContextFreeGrammar contextFreeGrammar = new 
ContextFreeGrammar(nonTerminals, terminals, rules, startSymbol, true);
     String[] expansion = contextFreeGrammar.leftMostDerivation("S", "CJ", "S");
     checkExpansion(expansion);
-
     expansion = contextFreeGrammar.leftMostDerivation("S", "DJ", "S", "CJ", 
"P");
     checkExpansion(expansion);
   }

Modified: 
opennlp/sandbox/nlp-utils/src/test/java/org/apache/opennlp/utils/cfg/ProbabilisticContextFreeGrammarTest.java
URL: 
http://svn.apache.org/viewvc/opennlp/sandbox/nlp-utils/src/test/java/org/apache/opennlp/utils/cfg/ProbabilisticContextFreeGrammarTest.java?rev=1700493&r1=1700492&r2=1700493&view=diff
==============================================================================
--- 
opennlp/sandbox/nlp-utils/src/test/java/org/apache/opennlp/utils/cfg/ProbabilisticContextFreeGrammarTest.java
 (original)
+++ 
opennlp/sandbox/nlp-utils/src/test/java/org/apache/opennlp/utils/cfg/ProbabilisticContextFreeGrammarTest.java
 Tue Sep  1 11:23:51 2015
@@ -120,10 +120,10 @@ public class ProbabilisticContextFreeGra
     ProbabilisticContextFreeGrammar pcfg = new 
ProbabilisticContextFreeGrammar(nonTerminals, terminals, rules, startSymbol);
 
     double pi = pcfg.pi(sentence, 0, 1, 
pcfg.getStartSymbol()).getProbability();
-    assertTrue(pi <= 1 && pi >= 0);
+    assertEquals(0.3d, pi, 0d);
 
-    pi = pcfg.pi(sentence, 2, 7, "VP").getProbability();
-    assertTrue(pi <= 1 && pi >= 0);
+    pi = pcfg.pi(sentence, 2, 4, "VP").getProbability();
+    assertEquals(0.35d, pi, 0d);
   }
 
   @Test