parse entities before html escaping

1 files changed, 5 insertions, 5 deletions

diff --git a/src/test/java/com/juick/MessageTest.java b/src/test/java/com/juick/MessageTest.java
index f76054cd..1d59a8db 100644
--- a/src/test/java/com/juick/MessageTest.java
+++ b/src/test/java/com/juick/MessageTest.java
@@ -24,10 +24,7 @@ import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
@@ -187,9 +184,12 @@ public class MessageTest {
     }
     @Test
     public void entitiesTest() {
-        String msg = "http://google.com - there will @ugnich ask questions from #4321, then go to http://stackoverflow.com";
+        String msg = "> how ?\nhttp://google.com - there _will_ @ugnich ask questions from #4321, then go to [stackoverflow](http://stackoverflow.com)";
         Message testMessage = MockUtils.mockMessage(514, MockUtils.mockUser(5432, "fmap", "secret"), msg);
         List<Entity> entities = MessageUtils.getEntities(testMessage);
-        assertThat(entities.size(), is(4));
+        assertThat(entities.size(), is(6));
+        assertThat(entities.stream().filter(e -> e.getType().equals("q")).count(), is(1L));
+        assertThat(entities.stream().filter(e -> e.getType().equals("u")).count(), is(1L));
+        assertThat(entities.stream().filter(e -> e.getType().equals("a")).count(), is(4L));
     }
 }