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=75e6b1c7033a70ff50c31106363311e9a8ac050a;hb=1df1bf64759d35d3d72b9d96b26b71118fdbe031;hp=b79a8a03d82ebc1a6431a19c888e888fc3cbddf4;hpb=db84ccc332884c4b89b755923538cecf2f00df68;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 b79a8a03d..75e6b1c70 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,14 +1,34 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed 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.argeo.server.jxl.dao;
 
-import java.io.InputStream;
+import java.util.List;
 
 import junit.framework.TestCase;
 
+import org.springframework.core.io.ClassPathResource;
+
+@SuppressWarnings("restriction")
 public class JxlDaoSupportTest extends TestCase {
-	public void testBasic() {
+	public void testBasic() throws Exception {
 		JxlDaoSupport jsd = new JxlDaoSupport();
-		InputStream in = getClass().getResourceAsStream("/dao/simple.xls");
-		jsd.load(in);
+		jsd.getExternalRefs().put("test", new OtherObject());
+
+		jsd.getResources().add(new ClassPathResource("/dao/simple.xls"));
+		jsd.init();
 
 		SimpleObject soAaa = jsd.getByKey(SimpleObject.class, "aaa");
 		assertNotNull(soAaa);
@@ -22,5 +42,12 @@ public class JxlDaoSupportTest extends TestCase {
 		assertNotNull(soBbb.getOtherObject());
 		assertEquals("bbb", ((SimpleObject) soBbb.getOtherObject().getValue())
 				.getString());
+
+		List<SimpleObject> simpleObjects = jsd.list(SimpleObject.class, null);
+		assertEquals(4, simpleObjects.size());
+
+		List<CollectionsObject> collectionsObjects = jsd.list(
+				CollectionsObject.class, null);
+		assertEquals(4, collectionsObjects.size());
 	}
 }