Fixing Tests

ram-g-athreya · ram-g-athreya · commit bb4a5dcba84b · 2017-08-03T22:44:47.000+05:30
diff --git a/src/test/java/chatbot/lib/handlers/TestNLHandler.java b/src/test/java/chatbot/lib/handlers/TestNLHandler.java
@@ -34,23 +34,18 @@ private void checkLiteral(String userId, String question) throws Exception {
     }
 
     private void checkEntity(String userId, String question, boolean single) throws Exception {
-        try {
-            NLHandler nlHandler = new NLHandler(new Request().setUserId(userId), question, TestUtility.getHelper());
-            List<Response> response = nlHandler.answer().getResponse();
-
-            TestResponseBase.checkTextMessage(response.get(0));
-            if(single) {
-                assertEquals(response.get(1).getMessageData().size(), 1); // Check that Carousel contains only 1 element
-            }
-            else {
-                assertEquals(response.get(1).getMessageData().size() >= 1, true); // Check that Carousel contains atleast 1 element
-            }
+        NLHandler nlHandler = new NLHandler(new Request().setUserId(userId), question, TestUtility.getHelper());
+        List<Response> response = nlHandler.answer().getResponse();
 
-            TestResponseBase.checkCarouselMessage(response.get(1));
+        TestResponseBase.checkTextMessage(response.get(0));
+        if(single) {
+            assertEquals(response.get(1).getMessageData().size(), 1); // Check that Carousel contains only 1 element
         }
-        catch (Exception e) {
-            e.printStackTrace();
+        else {
+            assertEquals(response.get(1).getMessageData().size() >= 1, true); // Check that Carousel contains atleast 1 element
         }
+
+        TestResponseBase.checkCarouselMessage(response.get(1));
     }
 
     @Test
diff --git a/src/test/java/chatbot/lib/handlers/TestTextHandler.java b/src/test/java/chatbot/lib/handlers/TestTextHandler.java
@@ -12,7 +12,7 @@ public class TestTextHandler {
 
     @Test
     public void testSanitizeText() throws Exception {
-        System.out.println(new TextHandler(null, "download nlp dataset", TestUtility.getHelper()).getTextMessage());
-        assertEquals("download nlp dataset", new TextHandler(null, "download nlp dataset", TestUtility.getHelper()).getTextMessage());
+        // Request and Helper do not matter for this test case
+        assertEquals("download nlp dataset", new TextHandler(null, "download nlp dataset", null));
     }
 }
diff --git a/src/test/java/rivescript/dbpedia/TestDBpediaDataset.java b/src/test/java/rivescript/dbpedia/TestDBpediaDataset.java
@@ -12,9 +12,7 @@ public class TestDBpediaDataset extends RiveScriptBase {
     @Test
     public void testDBpediaDataset() {
         String[] testCases = new String[]{"I'm starting my master research work on NLP. I want to use DBpedia dataset. But I don't know how to use it. Who can help me?", "Download nlp dataset"};
-        ArrayList<String[]> expectedAnswer = new ArrayList<String[]>(){{
-            add(new String[]{"{\"type\": \"template\", \"name\": \"dbpedia-dataset-nlp\"}"});
-        }};
+        String[] expectedAnswer = new String[]{"{\"type\": \"template\", \"name\": \"dbpedia-dataset-nlp\"}"};
         checkAnswers(testCases, expectedAnswer, true);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class TestTextHandler {`
`12`	`12`
`13`	`13`	`@Test`
`14`	`14`	`public void testSanitizeText() throws Exception {`
`15`		`- System.out.println(new TextHandler(null, "download nlp dataset", TestUtility.getHelper()).getTextMessage());`
`16`		`- assertEquals("download nlp dataset", new TextHandler(null, "download nlp dataset", TestUtility.getHelper()).getTextMessage());`
	`15`	`+ // Request and Helper do not matter for this test case`
	`16`	`+ assertEquals("download nlp dataset", new TextHandler(null, "download nlp dataset", null));`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,7 @@ public class TestDBpediaDataset extends RiveScriptBase {`
`12`	`12`	`@Test`
`13`	`13`	`public void testDBpediaDataset() {`
`14`	`14`	`String[] testCases = new String[]{"I'm starting my master research work on NLP. I want to use DBpedia dataset. But I don't know how to use it. Who can help me?", "Download nlp dataset"};`
`15`		`- ArrayList<String[]> expectedAnswer = new ArrayList<String[]>(){{`
`16`		`- add(new String[]{"{\"type\": \"template\", \"name\": \"dbpedia-dataset-nlp\"}"});`
`17`		`- }};`
	`15`	`+ String[] expectedAnswer = new String[]{"{\"type\": \"template\", \"name\": \"dbpedia-dataset-nlp\"}"};`
`18`	`16`	`checkAnswers(testCases, expectedAnswer, true);`
`19`	`17`	`}`
`20`	`18`	`}`