[tika] 05/30: XHTML improvements

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git

commit f3508f2ff4cb827be315de95dacf3e59ab23c7c8
Author: Nick Burch <ni...@gagravarr.org>
AuthorDate: Fri Apr 27 00:06:21 2018 +0100

    XHTML improvements
---
 .../org/apache/tika/parser/sas/SAS7BDATParser.java |  8 +--
 .../apache/tika/parser/sas/SAS7BDATParserTest.java | 72 ++++++++++++++++++++++
 2 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/sas/SAS7BDATParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/sas/SAS7BDATParser.java
index 1cef3cd..4944c12 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/sas/SAS7BDATParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/sas/SAS7BDATParser.java
@@ -63,7 +63,7 @@ public class SAS7BDATParser extends AbstractParser {
         xhtml.startDocument();
         
         SasFileReader sas = new SasFileReaderImpl(stream);
-        
+
         // TODO Metadata
 
         // Output as a table
@@ -85,9 +85,7 @@ public class SAS7BDATParser extends AbstractParser {
         while ((row = sas.readNext()) != null) {
             xhtml.startElement("tr");
             for (String val : DataWriterUtil.getRowValues(sas.getColumns(), row)) {
-                xhtml.startElement("td");
-                xhtml.characters(val);
-                xhtml.endElement("td");
+                xhtml.element("td", val);
             }
             xhtml.endElement("tr");
             xhtml.newline();
@@ -95,6 +93,6 @@ public class SAS7BDATParser extends AbstractParser {
 
         // Finish
         xhtml.endElement("table");
-        xhtml.newline();
+        xhtml.endDocument();
     }
 }
diff --git a/tika-parsers/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java b/tika-parsers/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java
new file mode 100644
index 0000000..9f57c95
--- /dev/null
+++ b/tika-parsers/src/test/java/org/apache/tika/parser/sas/SAS7BDATParserTest.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tika.parser.sas;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.tika.TikaTest;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.metadata.TikaCoreProperties;
+import org.apache.tika.parser.AutoDetectParser;
+import org.apache.tika.parser.ParseContext;
+import org.apache.tika.parser.Parser;
+import org.apache.tika.sax.BodyContentHandler;
+import org.apache.tika.sax.WriteOutContentHandler;
+import org.junit.Test;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.helpers.DefaultHandler;
+
+public class SAS7BDATParserTest extends TikaTest {
+    private Parser parser = new SAS7BDATParser();
+    
+    @Test
+    public void testSimpleFile() throws Exception {
+        ContentHandler handler = new BodyContentHandler();
+        Metadata metadata = new Metadata();
+
+        try (InputStream stream = SAS7BDATParserTest.class.getResourceAsStream(
+                "/test-documents/testSAS.sas7bdat")) {
+            parser.parse(stream, handler, metadata, new ParseContext());
+        }
+
+        assertEquals("application/x-sas-data", metadata.get(Metadata.CONTENT_TYPE));
+        // TODO Test the metadata
+        // TODO Test the contents
+    }
+    
+    @Test
+    public void testMultiColumns() throws Exception {
+        Parser parser = new AutoDetectParser(); // Should auto-detect!
+        ContentHandler handler = new BodyContentHandler();
+        Metadata metadata = new Metadata();
+
+        try (InputStream stream = SAS7BDATParserTest.class.getResourceAsStream(
+                "/test-documents/test-columnar.sas7bdat")) {
+            parser.parse(stream, handler, metadata, new ParseContext());
+        }
+
+        assertEquals("application/x-sas-data", metadata.get(Metadata.CONTENT_TYPE));
+        // TODO Test the metadata
+        // TODO Test the contents
+    }
+
+    // TODO HTML contents unit test
+}