X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jxl%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fserver%2Fjxl%2Fdao%2FJxlDaoSupportTest.java;h=0a003b6b773552ec42a2926fea8e8cf894ca4305;hb=c5bb48d71ad5d71e389137e5fb95f96d9005a942;hp=5de2b5af1239269f0a739d18b9f67ba38d9fb154;hpb=41848e7c37cc837179b0e1e8f91b7afd16fb2af4;p=lgpl%2Fargeo-commons.git

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 5de2b5af1..0a003b6b7 100644
--- 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,40 +1,33 @@
 package org.argeo.server.jxl.dao;
 
-import java.io.InputStream;
 import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.springframework.core.io.ClassPathResource;
+
 public class JxlDaoSupportTest extends TestCase {
 	public void testBasic() throws Exception {
 		JxlDaoSupport jsd = new JxlDaoSupport();
 		jsd.getExternalRefs().put("test", new OtherObject());
 
-		InputStream in = null;
-		try {
-			in = getClass().getResourceAsStream("/dao/simple.xls");
-			jsd.load(in);
-
-			SimpleObject soAaa = jsd.getByKey(SimpleObject.class, "aaa");
-			assertNotNull(soAaa);
-			assertEquals("aaa", soAaa.getString());
-			assertEquals(1, soAaa.getInteger().intValue());
-			assertNotNull(soAaa.getOtherObject());
-			assertEquals("USD", soAaa.getOtherObject().getKey());
-			assertEquals("US Dollar", soAaa.getOtherObject().getValue());
-
-			SimpleObject soBbb = jsd.getByKey(SimpleObject.class, "bbb");
-			assertNotNull(soBbb.getOtherObject());
-			assertEquals("bbb", ((SimpleObject) soBbb.getOtherObject()
-					.getValue()).getString());
-
-			List<SimpleObject> simpleObjects = jsd.list(SimpleObject.class,
-					null);
-			assertEquals(2, simpleObjects.size());
-		} finally {
-			if (in != null)
-				in.close();
-		}
+		jsd.getWorkbooks().add(new ClassPathResource("/dao/simple.xls"));
+		jsd.init();
+
+		SimpleObject soAaa = jsd.getByKey(SimpleObject.class, "aaa");
+		assertNotNull(soAaa);
+		assertEquals("aaa", soAaa.getString());
+		assertEquals(1, soAaa.getInteger().intValue());
+		assertNotNull(soAaa.getOtherObject());
+		assertEquals("USD", soAaa.getOtherObject().getKey());
+		assertEquals("US Dollar", soAaa.getOtherObject().getValue());
+
+		SimpleObject soBbb = jsd.getByKey(SimpleObject.class, "bbb");
+		assertNotNull(soBbb.getOtherObject());
+		assertEquals("bbb", ((SimpleObject) soBbb.getOtherObject().getValue())
+				.getString());
 
+		List<SimpleObject> simpleObjects = jsd.list(SimpleObject.class, null);
+		assertEquals(2, simpleObjects.size());
 	}
 }