Fixes dbpedia#2 and Added Test for dbpedia#1 and dbpedia#2

ram-g-athreya · ram-g-athreya · commit da74857fa34d · 2017-07-14T08:33:50.000+05:30
diff --git a/src/main/java/chatbot/lib/api/qa/QAService.java b/src/main/java/chatbot/lib/api/qa/QAService.java
@@ -38,7 +38,7 @@ public QAService(WolframRepository wolframRepository) {
     // Calls QA Service then returns resulting data as a list of Data Objects. The Data class is defined below as an inner class to be used here locally
     public Data search(String question) throws Exception {
         return qanary.search(question)
-                .addData(wolframAlpha.search(question));
+                .addData(wolframAlpha.search(question), true);
     }
 
     public static class Data {
@@ -62,9 +62,17 @@ public Data addLiteral(String literal) {
             return this;
         }
 
-        public Data addData(Data data) {
+        public Data addData(Data data, boolean fromWolfram) {
             uris.addAll(data.getUris());
-            literals.addAll(data.getLiterals());
+            // Literal values from WolframAlpha supersede QANARY since they have more detailed information
+            if (fromWolfram) {
+                if(data.getLiterals().size() > 0) {
+                    literals = data.getLiterals();
+                }
+            }
+            else {
+                literals.addAll(data.getLiterals());
+            }
             return this;
         }
 
diff --git a/src/test/java/chatbot/lib/handlers/TestNLHandler.java b/src/test/java/chatbot/lib/handlers/TestNLHandler.java
@@ -45,6 +45,7 @@ private void checkEntity(String userId, String question) throws Exception {
     @Test
     public void testLiteral() throws Exception {
         checkLiteral("user", "What is the population of France?");
+        checkLiteral("user", "When was Angela Merkel born?");
     }
 
     @Test
diff --git a/src/test/java/chatbot/lib/response/TestResponseBase.java b/src/test/java/chatbot/lib/response/TestResponseBase.java
@@ -16,6 +16,7 @@ public static void checkTextMessage(Response response) {
         assertEquals(response.getMessageType(), ResponseType.TEXT_MESSAGE);
         assertEquals(messageData.size(), 1);
         assertNotNull(messageData.get(0).getText());
+        assertEquals(messageData.get(0).getText().contains("\n"), false); // Check that we are showing only 1 response and not both responses from both QA Systems
     }
 
     public static void checkButtons(List<ResponseData.Button> buttons) {
diff --git a/src/test/java/rivescript/TestBot.java b/src/test/java/rivescript/TestBot.java
@@ -0,0 +1,17 @@
+package rivescript;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+
+/**
+ * Created by ramgathreya on 7/14/17.
+ */
+public class TestBot extends RiveScriptBase {
+    @Test
+    public void testBotName() {
+        String[] testCases = new String[]{"Hi what is your name", "Hi, what is your name"};
+        String[] expectedAnswer = new String[]{"I am the DBpedia Bot"};
+        checkAnswers(testCases, expectedAnswer, true);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ private void checkEntity(String userId, String question) throws Exception {`
`45`	`45`	`@Test`
`46`	`46`	`public void testLiteral() throws Exception {`
`47`	`47`	`checkLiteral("user", "What is the population of France?");`
	`48`	`+ checkLiteral("user", "When was Angela Merkel born?");`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ public static void checkTextMessage(Response response) {`
`16`	`16`	`assertEquals(response.getMessageType(), ResponseType.TEXT_MESSAGE);`
`17`	`17`	`assertEquals(messageData.size(), 1);`
`18`	`18`	`assertNotNull(messageData.get(0).getText());`
	`19`	`+ assertEquals(messageData.get(0).getText().contains("\n"), false); // Check that we are showing only 1 response and not both responses from both QA Systems`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`public static void checkButtons(List<ResponseData.Button> buttons) {`