Emit combined text for mixed content in HtmlDecoder

Was only emitting the children's text before

Author: fsteeg

metafacture-html/src/main/java/org/metafacture/html/HtmlDecoder.java

@@ -98,12 +98,10 @@ private void process(final Element parent, final StreamReceiver receiver) {
                 addedValueAsSubfield = handleAttributeValuesAsSubfields(receiver, element, attributes, attribute);
                 receiver.literal(attribute.getKey(), attribute.getValue());
             }
-            if (element.children().isEmpty()) {
-                final String text = element.text().trim();
-                final String value = text.isEmpty() ? element.data() : text;
-                if (!value.isEmpty() && !addedValueAsSubfield) {
-                    receiver.literal("value", value);
-                }
+            final String text = element.text().trim();
+            final String value = text.isEmpty() ? element.data() : text;
+            if (!value.isEmpty() && !addedValueAsSubfield) {
+                receiver.literal("value", value);
             }
             process(element, receiver);
             receiver.endEntity();

metafacture-html/src/test/java/org/metafacture/html/HtmlDecoderTest.java

@@ -77,6 +77,17 @@ public void nestedEntities() {
 
     }
 
+    @Test
+    public void mixedContent() {
+        htmlDecoder.process(new StringReader("<p>This is the <strong>full</strong> text</p>"));
+        final InOrder ordered = inOrder(receiver);
+        ordered.verify(receiver).startEntity("p");
+        ordered.verify(receiver).literal("value", "This is the full text");
+        // elements above plus body, html
+        ordered.verify(receiver, times(4)).endEntity();
+
+    }
+
     @Test
     public void htmlAttributesAsLiterals() {
         htmlDecoder.process(new StringReader("<p class=lead>Text"));