projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to deal with encoding
[lgpl/argeo-commons.git]
/
server
/
runtime
/
org.argeo.server.jxl
/
src
/
test
/
java
/
org
/
argeo
/
server
/
jxl
/
dao
/
JxlDaoSupportTest.java
diff --git
a/server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/JxlDaoSupportTest.java
b/server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/JxlDaoSupportTest.java
index b79a8a03d82ebc1a6431a19c888e888fc3cbddf4..76c44a7f53286e4e640dab064993bac914c5153f 100644
(file)
--- a/
server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/JxlDaoSupportTest.java
+++ b/
server/runtime/org.argeo.server.jxl/src/test/java/org/argeo/server/jxl/dao/JxlDaoSupportTest.java
@@
-1,14
+1,18
@@
package org.argeo.server.jxl.dao;
package org.argeo.server.jxl.dao;
-import java.
io.InputStream
;
+import java.
util.List
;
import junit.framework.TestCase;
import junit.framework.TestCase;
+import org.springframework.core.io.ClassPathResource;
+
public class JxlDaoSupportTest extends TestCase {
public class JxlDaoSupportTest extends TestCase {
- public void testBasic() {
+ public void testBasic()
throws Exception
{
JxlDaoSupport jsd = new JxlDaoSupport();
JxlDaoSupport jsd = new JxlDaoSupport();
- InputStream in = getClass().getResourceAsStream("/dao/simple.xls");
- jsd.load(in);
+ jsd.getExternalRefs().put("test", new OtherObject());
+
+ jsd.getWorkbooks().add(new ClassPathResource("/dao/simple.xls"));
+ jsd.init();
SimpleObject soAaa = jsd.getByKey(SimpleObject.class, "aaa");
assertNotNull(soAaa);
SimpleObject soAaa = jsd.getByKey(SimpleObject.class, "aaa");
assertNotNull(soAaa);
@@
-22,5
+26,8
@@
public class JxlDaoSupportTest extends TestCase {
assertNotNull(soBbb.getOtherObject());
assertEquals("bbb", ((SimpleObject) soBbb.getOtherObject().getValue())
.getString());
assertNotNull(soBbb.getOtherObject());
assertEquals("bbb", ((SimpleObject) soBbb.getOtherObject().getValue())
.getString());
+
+ List<SimpleObject> simpleObjects = jsd.list(SimpleObject.class, null);
+ assertEquals(4, simpleObjects.size());
}
}
}
}