You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2014/01/05 20:57:11 UTC

[4/4] git commit: Added test case for Excel data contexts.

Added test case for Excel data contexts.

Project: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/commit/5ce666fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/tree/5ce666fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metamodel/diff/5ce666fa

Branch: refs/heads/spring-module
Commit: 5ce666fa3b601ddee57e24a7bfb86d49046cd582
Parents: 5bc3d1b
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sun Jan 5 20:55:39 2014 +0100
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sun Jan 5 20:55:39 2014 +0100

----------------------------------------------------------------------
 ...vSpecifiedConfigurationFromFilenameTest.java |   3 ++
 ...lSpecifiedConfigurationFromFilenameTest.java |  41 +++++++++++++++++++
 spring/src/test/resources/data/example.xlsx     | Bin 0 -> 7449 bytes
 .../resources/examples/csv-using-filename.xml   |   1 +
 .../resources/examples/excel-using-filename.xml |  13 ++++++
 5 files changed, 58 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5ce666fa/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java
----------------------------------------------------------------------
diff --git a/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java b/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java
index 6867fbf..a2ba1fd 100644
--- a/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java
+++ b/spring/src/test/java/org/apache/metamodel/spring/CsvSpecifiedConfigurationFromFilenameTest.java
@@ -8,6 +8,7 @@ import org.apache.metamodel.DataContext;
 import org.apache.metamodel.csv.CsvDataContext;
 import org.apache.metamodel.util.FileResource;
 import org.apache.metamodel.util.Resource;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,5 +34,7 @@ public class CsvSpecifiedConfigurationFromFilenameTest {
         assertEquals("example.csv", resource.getName());
 
         assertEquals("[\"foo\", bar]", Arrays.toString(csv.getDefaultSchema().getTable(0).getColumnNames()));
+
+        Assert.assertFalse(csv.getConfiguration().isMultilineValues());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5ce666fa/spring/src/test/java/org/apache/metamodel/spring/ExcelSpecifiedConfigurationFromFilenameTest.java
----------------------------------------------------------------------
diff --git a/spring/src/test/java/org/apache/metamodel/spring/ExcelSpecifiedConfigurationFromFilenameTest.java b/spring/src/test/java/org/apache/metamodel/spring/ExcelSpecifiedConfigurationFromFilenameTest.java
new file mode 100644
index 0000000..86b80c5
--- /dev/null
+++ b/spring/src/test/java/org/apache/metamodel/spring/ExcelSpecifiedConfigurationFromFilenameTest.java
@@ -0,0 +1,41 @@
+package org.apache.metamodel.spring;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+
+import org.apache.metamodel.DataContext;
+import org.apache.metamodel.excel.ExcelDataContext;
+import org.apache.metamodel.util.FileResource;
+import org.apache.metamodel.util.Resource;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:examples/excel-using-filename.xml")
+public class ExcelSpecifiedConfigurationFromFilenameTest {
+
+    @Autowired
+    private DataContext dataContext;
+
+    @Test
+    public void testReadDataContext() {
+        assertEquals(ExcelDataContext.class, dataContext.getClass());
+
+        ExcelDataContext excel = (ExcelDataContext) dataContext;
+        Resource resource = excel.getResource();
+
+        assertEquals(FileResource.class, resource.getClass());
+
+        assertEquals("example.xlsx", resource.getName());
+
+        assertEquals("[hello, world]", Arrays.toString(excel.getDefaultSchema().getTable(0).getColumnNames()));
+
+        Assert.assertTrue(excel.getConfiguration().isSkipEmptyLines());
+        Assert.assertTrue(excel.getConfiguration().isSkipEmptyColumns());
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5ce666fa/spring/src/test/resources/data/example.xlsx
----------------------------------------------------------------------
diff --git a/spring/src/test/resources/data/example.xlsx b/spring/src/test/resources/data/example.xlsx
new file mode 100644
index 0000000..b3661d9
Binary files /dev/null and b/spring/src/test/resources/data/example.xlsx differ

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5ce666fa/spring/src/test/resources/examples/csv-using-filename.xml
----------------------------------------------------------------------
diff --git a/spring/src/test/resources/examples/csv-using-filename.xml b/spring/src/test/resources/examples/csv-using-filename.xml
index df6320e..c0934ed 100644
--- a/spring/src/test/resources/examples/csv-using-filename.xml
+++ b/spring/src/test/resources/examples/csv-using-filename.xml
@@ -8,6 +8,7 @@
 		<property name="filename" value="src/test/resources/data/example.csv" />
 		<property name="quoteChar" value="none" />
 		<property name="separatorChar" value="," />
+		<property name="multilineValues" value="false" />
 	</bean>
 
 </beans>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-metamodel/blob/5ce666fa/spring/src/test/resources/examples/excel-using-filename.xml
----------------------------------------------------------------------
diff --git a/spring/src/test/resources/examples/excel-using-filename.xml b/spring/src/test/resources/examples/excel-using-filename.xml
new file mode 100644
index 0000000..0fa5e19
--- /dev/null
+++ b/spring/src/test/resources/examples/excel-using-filename.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+	<bean class="org.apache.metamodel.spring.DataContextFactoryBean">
+		<property name="type" value="Excel" />
+		<property name="filename" value="src/test/resources/data/example.xlsx" />
+		<property name="skipEmptyLines" value="true" />
+		<property name="skipEmptyColumns" value="true" />
+	</bean>
+
+</beans>
\ No newline at end of file