github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#716 - Remove createNamedQuery() and createQuery(Class<T> beanType, String query) ... use criteria API, query beans and RawSql

Browse Source
This commit is contained in:
Robin Bygrave
2016-05-20 22:13:58 +12:00
parent a20822a9e1
commit 11d623cb69
58 changed files with 56 additions and 3578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java
-25
View File
@@ -275,16 +275,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
return null;
}
@Override
public <T> Query<T> createNamedQuery(Class<T> beanType, String namedQuery) {
return null;
}
@Override
public <T> Query<T> createQuery(Class<T> beanType, String query) {
return null;
}
@Override
public <T> Query<T> createQuery(Class<T> beanType) {
return null;
@@ -315,11 +305,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
}
@Override
public <T> Update<T> createNamedUpdate(Class<T> beanType, String namedUpdate) {
return null;
}
@Override
public <T> Update<T> createUpdate(Class<T> beanType, String ormUpdate) {
return null;
@@ -330,11 +315,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
return null;
}
@Override
public SqlQuery createNamedSqlQuery(String namedQuery) {
return null;
}
@Override
public SqlUpdate createSqlUpdate(String sql) {
return null;
@@ -345,11 +325,6 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
return null;
}
@Override
public SqlUpdate createNamedSqlUpdate(String namedQuery) {
return null;
}
@Override
public void register(TransactionCallback transactionCallback) throws PersistenceException {
src/test/java/com/avaje/ebeaninternal/server/querydefn/TestQueryLanguage.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class TestQueryLanguage extends BaseTestCase {
BeanDescriptor<Order> desc = server.getBeanDescriptor(Order.class);
DefaultOrmQuery<Order> qry = new DefaultOrmQuery<Order>(desc, server,
new DefaultExpressionFactory(false, false), (String) null);
new DefaultExpressionFactory(false, false));
p.assign(qry);
return qry;
src/test/java/com/avaje/tests/basic/TestJoinInheritance.java
-17
View File
@@ -80,22 +80,5 @@ public class TestJoinInheritance extends BaseTestCase {
Ebean.save(trip);
}
Ebean.beginTransaction();
Query<Trip> q = Ebean.createQuery(Trip.class, "join address join vehicleDriver ");
List<Trip> trips = q.findList();
Assert.assertTrue(trips.size() == nrDrivers);
for (Trip t:trips){
Address a = t.getAddress();
Assert.assertTrue(line1.equals(a.getLine1()));
Assert.assertTrue(line2.equals(a.getLine2()));
Assert.assertTrue(city.equals(a.getCity()));
}
Ebean.endTransaction();
}
}
src/test/java/com/avaje/tests/basic/TestMappedSuper.java
+2 -19
View File
@@ -1,14 +1,10 @@
package com.avaje.tests.basic;
import java.util.List;
import org.junit.Assert;
import org.junit.Test;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.Query;
import com.avaje.tests.model.basic.TMapSuperEntity;
import org.junit.Assert;
import org.junit.Test;
public class TestMappedSuper extends BaseTestCase {
@@ -28,19 +24,6 @@ public class TestMappedSuper extends BaseTestCase {
Assert.assertNotNull(e2);
// using a raw SQL query that populates a transient field
Query<TMapSuperEntity> query = Ebean.createNamedQuery(TMapSuperEntity.class, "testTransient");
List<TMapSuperEntity> list = query.where()
.gt("id", 0)
.istartsWith("name", "bab")
.findList();
Assert.assertTrue(list.size() >= 1);
TMapSuperEntity e3 = list.get(0);
Integer myint = e3.getMyint();
Assert.assertEquals(Integer.valueOf(12), myint);
TMapSuperEntity eSaveDelete = new TMapSuperEntity();
eSaveDelete.setName("babana");
src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java
+16 -12
View File
@@ -2,6 +2,8 @@ package com.avaje.tests.basic;
import java.util.List;
import com.avaje.ebean.RawSql;
import com.avaje.ebean.RawSqlBuilder;
import org.junit.Assert;
import org.junit.Test;
@@ -17,23 +19,25 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase {
ResetBasicData.reset();
List<OrderAggregate> l0 = Ebean.find(OrderAggregate.class).findList();
String sql =
"select order_id, count(*) as totalItems, sum(order_qty*unit_price) as totalAmount \n" +
"from o_order_detail \n" +
"group by order_id";
RawSql rawSql = RawSqlBuilder.parse(sql).columnMapping("order_id", "order.id").create();
List<OrderAggregate> l0 =
Ebean.find(OrderAggregate.class)
.setRawSql(rawSql)
.findList();
for (OrderAggregate r0 : l0) {
r0.toString();
}
List<OrderAggregate> list = Ebean.createNamedQuery(OrderAggregate.class, "total.amount")
.where().gt("order.id", 0).having().gt("totalAmount", 50).findList();
for (OrderAggregate r1 : list) {
Assert.assertTrue(r1.getTotalAmount() > 20.50);
// partial object query without totalItems
// ... no lazy loading invoked on this type of bean
Assert.assertTrue(r1.getTotalItems() == null);
}
List<OrderAggregate> l2 = Ebean.createQuery(OrderAggregate.class).where().gt("order.id", 0)
List<OrderAggregate> l2 = Ebean.createQuery(OrderAggregate.class)
.setRawSql(rawSql)
.where().gt("order.id", 0)
.having().lt("totalItems", 3).gt("totalAmount", 50).findList();
for (OrderAggregate r2 : l2) {
src/test/java/com/avaje/tests/basic/TestQueryParse.java
-32
View File
@@ -1,32 +0,0 @@
package com.avaje.tests.basic;
import org.junit.Assert;
import org.junit.Test;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.OrderBy;
import com.avaje.ebean.Query;
import com.avaje.tests.model.basic.Order;
import com.avaje.tests.model.basic.ResetBasicData;
public class TestQueryParse extends BaseTestCase {
@Test
public void test() {
//GlobalProperties.put("ebean.ddl.generate", "false");
//GlobalProperties.put("ebean.ddl.run", "false");
ResetBasicData.reset();
String oql = "where 1=1 order by customer.name desc, status";
Query<Order> query = Ebean.createQuery(Order.class, oql);
OrderBy<Order> order = query.order();
Assert.assertTrue(order.getProperties().size() == 2);
Assert.assertEquals("customer.name",order.getProperties().get(0).getProperty());
Assert.assertFalse(order.getProperties().get(0).isAscending());
Assert.assertEquals("status",order.getProperties().get(1).getProperty());
Assert.assertTrue(order.getProperties().get(1).isAscending());
}
}
src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java
-17
View File
@@ -56,18 +56,6 @@ public class TestEncrypt extends BaseTestCase {
Date earlyDob = new Date(System.currentTimeMillis() - 500000);
List<EBasicEncrypt> qlList = Ebean
.createQuery(EBasicEncrypt.class, "where description like :d and dob >= :dob")
.setParameter("d", "testde%").setParameter("dob", earlyDob).findList();
Assert.assertTrue(qlList.size() > 0);
qlList = Ebean
.createQuery(EBasicEncrypt.class, "find e (id, description) where description = :d")
.setParameter("d", "testdesc").findList();
Assert.assertTrue(qlList.size() == 1);
SqlQuery q = Ebean.createSqlQuery("select * from e_basicenc where id = :id");
q.setParameter("id", e.getId());
@@ -105,11 +93,6 @@ public class TestEncrypt extends BaseTestCase {
list = Ebean.find(EBasicEncrypt.class).where().startsWith("description", "modde").findList();
Assert.assertEquals(1, list.size());
list = Ebean.createQuery(EBasicEncrypt.class, "where description like :d")
.setParameter("d", "modde%").findList();
Assert.assertNotNull(list);
}
}
src/test/java/com/avaje/tests/batchload/TestLazyJoin2.java
-13
View File
@@ -71,19 +71,6 @@ public class TestLazyJoin2 extends BaseTestCase {
String name = customer2.getName();
Assert.assertNotNull(name);
String q = "find order join customer (+query(1) +lazy(10) name, status) join customer.contacts ";
Query<Order> query = Ebean.createQuery(Order.class, q);
List<Order> list3 = query.findList();
Order order3 = list3.get(0);
String n3 = order3.getCustomer().getName();
for (Order o3 : list3) {
o3.getCustomer().getName();
}
Assert.assertNotNull(n3);
}
}
src/test/java/com/avaje/tests/delete/TestDeleteByQuery.java
-14
View File
@@ -66,20 +66,6 @@ public class TestDeleteByQuery extends BaseTestCase {
assertThat(sql.get(0)).contains("delete from o_customer where name = ?");
}
@Test
public void delete_queryString() {
LoggedSqlCollector.start();
Ebean.createQuery(Customer.class, "where name = :name")
.setParameter("name","Don Roberto")
.delete();
List<String> sql = LoggedSqlCollector.stop();
assertThat(sql).hasSize(1);
assertThat(sql.get(0)).contains("delete from o_customer where name = ?");
}
@Test
public void testCommit() {
src/test/java/com/avaje/tests/inheritance/TestInheritanceJoins.java
-16
View File
@@ -34,14 +34,6 @@ public class TestInheritanceJoins extends BaseTestCase {
r.setProductConfiguration(pc);
r.setGroupConfiguration(gc);
server.save(r);
Query<CalculationResult> q = server.createNamedQuery(CalculationResult.class, "loadResult");
q.setParameter("charge", 100.0);
List<CalculationResult> results = q.findList();
Assert.assertTrue(!results.isEmpty());
}
@Test
@@ -84,14 +76,6 @@ public class TestInheritanceJoins extends BaseTestCase {
r.setProductConfiguration(pc);
r.setGroupConfiguration(null);
server.save(r);
Query<CalculationResult> q = server.createNamedQuery(CalculationResult.class, "loadResult");
q.setParameter("charge", charge);
List<CalculationResult> results = q.findList();
Assert.assertTrue(!results.isEmpty());
}
@Test
src/test/java/com/avaje/tests/query/TestInCollectionQueryPlan.java
-33
View File
@@ -1,33 +0,0 @@
package com.avaje.tests.query;
import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.tests.model.basic.Customer;
import com.avaje.tests.model.basic.ResetBasicData;
public class TestInCollectionQueryPlan extends BaseTestCase {
@Test
public void test() {
ResetBasicData.reset();
List<Object> idList1 = new ArrayList<Object>();
idList1.add(1);
String oq = "find customer where id in (:idList)";
Ebean.createQuery(Customer.class, oq).setParameter("idList", idList1).findList();
List<Object> idList2 = new ArrayList<Object>();
idList2.add(1);
idList2.add(2);
Ebean.createQuery(Customer.class, oq).setParameter("idList", idList2).findList();
}
}
src/test/java/com/avaje/tests/query/TestMyAdHocSqlSelect.java
+6 -1
View File
@@ -2,6 +2,8 @@ package com.avaje.tests.query;
import java.util.List;
import com.avaje.ebean.RawSql;
import com.avaje.ebean.RawSqlBuilder;
import org.junit.Assert;
import org.junit.Test;
@@ -17,7 +19,10 @@ public class TestMyAdHocSqlSelect extends BaseTestCase {
ResetBasicData.reset();
List<MyAdHoc> list = Ebean.find(MyAdHoc.class).where().gt("order_id", 0).having()
String sql = "select order_id, count(*) as detailCount from o_order_detail group by order_id";
RawSql rawSql = RawSqlBuilder.parse(sql).columnMapping("order_id", "order.id").create();
List<MyAdHoc> list = Ebean.find(MyAdHoc.class).setRawSql(rawSql).where().gt("order_id", 0).having()
.gt("detailCount", 0).findList();
Assert.assertNotNull(list);
src/test/java/com/avaje/tests/query/TestNoSpaceBracket.java
-21
View File
@@ -1,21 +0,0 @@
package com.avaje.tests.query;
import org.junit.Test;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.Query;
import com.avaje.tests.model.basic.Order;
public class TestNoSpaceBracket extends BaseTestCase {
@Test
public void test() {
Query<Order> query = Ebean.createQuery(Order.class, "find order join customer(id,name) ");
query.findList();
}
}
src/test/java/com/avaje/tests/query/TestQueryLimitOffsetSimple.java
-31
View File
@@ -1,31 +0,0 @@
package com.avaje.tests.query;
import org.junit.Test;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.Query;
import com.avaje.tests.model.basic.Order;
import com.avaje.tests.model.basic.ResetBasicData;
public class TestQueryLimitOffsetSimple extends BaseTestCase {
/**
* Test the syntax of the limit offset clause.
*/
@Test
public void testMe() {
ResetBasicData.reset();
Query<Order> query = Ebean.createQuery(Order.class, "where status = :A limit 100 offset 3");
query.setParameter("A", Order.Status.NEW);
query
.setFirstRow(10)
.order().asc("id")
.findList();
}
}
src/test/java/com/avaje/tests/query/TestQueryParsing.java
-69
View File
@@ -1,69 +0,0 @@
package com.avaje.tests.query;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.Query;
import com.avaje.ebeaninternal.api.SpiQuery;
import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail;
import com.avaje.tests.model.basic.Order;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class TestQueryParsing extends BaseTestCase {
@Test
public void test() {
String oq = "find order join customer (id, name) join customer.contacts join details (+query(4),+lazy(5))";
Query<Order> q = Ebean.createQuery(Order.class, oq);
checkQuery(q);
String oq1 = "find order join customer (id, name) join customer.contacts join details ( +query(4), +lazy(5) )";
SpiQuery<?> q1 = (SpiQuery<?>) Ebean.createQuery(Order.class, oq1);
checkQuery(q1);
String oq2 = "find order join customer (id, name) join customer.contacts join details ( +query(4), +lazy(5) , *)";
SpiQuery<?> q2 = (SpiQuery<?>) Ebean.createQuery(Order.class, oq2);
checkQuery(q2);
String oq3 = "find order join customer (id, name) join customer.contacts join details (+query(4),+lazy(5),*)";
SpiQuery<?> q3 = (SpiQuery<?>) Ebean.createQuery(Order.class, oq3);
checkQuery(q3);
String oq4 = "find order join customer (id, name) join customer.contacts join details (+query(4) +lazy(5) *)";
SpiQuery<?> q4 = (SpiQuery<?>) Ebean.createQuery(Order.class, oq4);
checkQuery(q4);
}
private void checkQuery(Query<?> q) {
SpiQuery<?> sq = (SpiQuery<?>) q;
OrmQueryDetail detail = sq.getDetail();
assertTrue(detail.getChunk(null, false).allProperties());
assertNotNull(detail.getChunk("customer", false));
assertFalse(detail.getChunk("customer", false).isQueryFetch());
assertFalse(detail.getChunk("customer", false).isLazyFetch());
assertFalse(detail.getChunk("customer", false).allProperties());
assertEquals("id, name",detail.getChunk("customer", false).getProperties());
assertNotNull(detail.getChunk("customer.contacts", false));
assertFalse(detail.getChunk("customer.contacts", false).isQueryFetch());
assertFalse(detail.getChunk("customer.contacts", false).isLazyFetch());
assertTrue(detail.getChunk("customer.contacts", false).allProperties());
assertNotNull(detail.getChunk("details", false));
assertTrue(detail.getChunk("details", false).isQueryFetch());
assertTrue(detail.getChunk("details", false).isLazyFetch());
assertEquals(4, detail.getChunk("details", false).getQueryFetchBatch());
assertEquals(5, detail.getChunk("details", false).getLazyFetchBatch());
assertTrue(detail.getChunk("details", false).allProperties());
}
}
src/test/java/com/avaje/tests/query/TestSubQuery.java
+1 -12
View File
@@ -30,18 +30,7 @@ public class TestSubQuery extends BaseTestCase {
Query<Order> sq = Ebean.createQuery(Order.class).select("id").where()
.in("details.product.id", productIds).query();
List<Order> list = Ebean.find(Order.class).where().in("id", sq).findList();
// FIXME: need to clear out old orders..
// Assert.assertEquals(2,list.size());
String oq = " find order (id, status) where id in "
+ "(select a.id from o_order a join o_order_detail ad on ad.order_id = a.id where ad.product_id in (:prods)) ";
Ebean.createQuery(Order.class, oq).setParameter("prods", productIds)
.findList();
Ebean.find(Order.class).where().in("id", sq).findList();
}
public void testCompositeKey() {
src/test/java/com/avaje/tests/query/orderby/TestOrderByWithFunction.java
-7
View File
@@ -24,12 +24,5 @@ public class TestOrderByWithFunction extends BaseTestCase {
String sql = query.getGeneratedSql();
Assert.assertTrue(sql.contains("order by length(t0.name)"));
String oq = "find customer ORDER BY LENGTH(name),name";
query = Ebean.createQuery(Customer.class, oq);
query.findList();
sql = query.getGeneratedSql();
Assert.assertTrue(sql.contains("order by LENGTH(t0.name)"));
}
}
src/test/java/com/avaje/tests/query/other/TestQueryConversationRowCount.java
-58
View File
@@ -63,63 +63,5 @@ public class TestQueryConversationRowCount extends BaseTestCase {
Assert.assertTrue(countSql.contains("select count(*) from ( select distinct t0.id c0 from c_conversation t0 left outer join c_participation u1 on u1.conversation_id = t0.id where t0.group_id = ? and ((t0.isopen = ? and u1.user_id = ? ) or t0.isopen = ? )"));
}
@Test
public void testUsingQueryLanguage() {
//"find conversation where club = :clubId and ( ( isPublic = :false and participants.user.id = :userId ) or isPublic = :true ) order by createdAt desc ";
String qry = "find conversation where group.id = :groupId and ( ( open = :false and participants.user.id = :userId ) or open = :true ) order by whenCreated desc ";
Long groupId = 1L;
Long userId = 1L;
Query<Conversation> query = Ebean.createQuery(Conversation.class, qry);
query.setParameter("groupId", groupId);
query.setParameter("userId", userId);
query.setParameter("false", false);
query.setParameter("true", true);
query.findList();
String generatedSql = query.getGeneratedSql();
// ACTUAL:
// select distinct t0.id c0, t0.title c1, t0.open c2, t0.version c3, t0.when_created c4, t0.when_updated c5, t0.group_id c6, t0.when_created
// from c_conversation t0
// join c_participation t1 on t1.conversation_id = t0.id
// where t0.group_id = ? and ( ( t0.open = ? and t1.user_id = ? ) or t0.open = ? )
// order by t0.when_created desc; --bind(1, false, 1, true, )
// SHOULD BE:
// select distinct t0.id c0, t0.title c1, t0.open c2, t0.version c3, t0.when_created c4, t0.when_updated c5, t0.group_id c6, t0.when_created
// from c_conversation t0
// left outer join c_participation u1 on u1.conversation_id = t0.id
// where t0.group_id = ? and ((t0.open = ? and u1.user_id = ? ) or t0.open = ? )
// order by t0.when_created desc;
Assert.assertTrue(generatedSql.contains("select distinct t0.id c0, t0.title c1, t0.isopen"));
// THE NEXT ASSERT CURRENTLY FAILS:
// Assert.assertTrue(generatedSql.contains("left outer join c_participation u1 on u1.conversation_id = t0.id"));
// Assert.assertTrue(generatedSql.contains("where t0.group_id = ? and ((t0.open = ? and u1.user_id = ? ) or t0.open = ? )"));
//
//
// LoggedSqlCollector.start();
// query.findRowCount();
//
// // select count(*) from (
// // select distinct t0.id c0
// // from c_conversation t0
// // left outer join c_participation u1 on u1.conversation_id = t0.id
// // where t0.group_id = ? and ((t0.open = ? and u1.user_id = ? ) or t0.open = ? )
// // ); --bind(1,true,1,true)
//
// List<String> loggedSql = LoggedSqlCollector.stop();
// Assert.assertEquals(1, loggedSql.size());
//
// String countSql = loggedSql.get(0);
//
// Assert.assertTrue(countSql.contains("select count(*) from ( select distinct t0.id c0 from c_conversation t0 left outer join c_participation u1 on u1.conversation_id = t0.id where t0.group_id = ? and ((t0.open = ? and u1.user_id = ? ) or t0.open = ? )"));
}
}
src/test/java/com/avaje/tests/rawsql/TestOrderReportTotal.java
+15 -2
View File
@@ -3,6 +3,8 @@ package com.avaje.tests.rawsql;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.Query;
import com.avaje.ebean.RawSql;
import com.avaje.ebean.RawSqlBuilder;
import com.avaje.tests.model.basic.OrderAggregate;
import com.avaje.tests.model.basic.OrderDetail;
import com.avaje.tests.model.basic.ResetBasicData;
@@ -20,12 +22,14 @@ public class TestOrderReportTotal extends BaseTestCase {
ResetBasicData.reset();
RawSql rawSql = getRawSql();
Query<OrderAggregate> query = Ebean.createQuery(OrderAggregate.class);
List<OrderAggregate> list = query.findList();
List<OrderAggregate> list = query.setRawSql(rawSql).findList();
assertNotNull(list);
Query<OrderAggregate> q2 = Ebean.createQuery(OrderAggregate.class);
Query<OrderAggregate> q2 = Ebean.createQuery(OrderAggregate.class).setRawSql(rawSql);
q2.where().gt("id", 1);
q2.having().gt("totalItems", 1);
@@ -34,6 +38,15 @@ public class TestOrderReportTotal extends BaseTestCase {
}
private RawSql getRawSql() {
String sql =
"select order_id, count(*) as totalItems, sum(order_qty*unit_price) as totalAmount \n" +
"from o_order_detail \n" +
"group by order_id";
return RawSqlBuilder.parse(sql).columnMapping("order_id", "order.id").create();
}
@Test
public void testOrderDetailCount() {
src/test/java/com/avaje/tests/rawsql/named/TestRawSqlNamedQuery.java
-25
View File
@@ -1,25 +0,0 @@
package com.avaje.tests.rawsql.named;
import org.junit.Test;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebean.Ebean;
import com.avaje.ebean.FetchConfig;
import com.avaje.ebean.Query;
import com.avaje.tests.model.basic.OrderAggregate;
import com.avaje.tests.model.basic.ResetBasicData;
public class TestRawSqlNamedQuery extends BaseTestCase {
@Test
public void test() {
ResetBasicData.reset();
Query<OrderAggregate> q = Ebean.createNamedQuery(OrderAggregate.class, "total.amount");
q.fetch("order", new FetchConfig().query());
q.findList();
}
}
src/test/java/com/avaje/tests/text/xml/TestDnodeXmlParser.java
-26
View File
@@ -1,26 +0,0 @@
package com.avaje.tests.text.xml;
import org.junit.Assert;
import org.junit.Test;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebeaninternal.server.lib.util.Dnode;
import com.avaje.ebeaninternal.server.lib.util.DnodeReader;
public class TestDnodeXmlParser extends BaseTestCase {
@Test
public void testSimple() {
String xmlString = "<doc><div class=\"hello\"><h1>heading</h1><p>paragraph</p></div></doc>";
DnodeReader r = new DnodeReader();
Dnode n = r.parseXml(xmlString);
String convertedTo = n.toXml();
Assert.assertEquals(xmlString, convertedTo);
}
}
src/test/java/com/avaje/tests/unitinternal/TestXmlConfigLoader.java
-91
View File
@@ -1,91 +0,0 @@
package com.avaje.tests.unitinternal;
import com.avaje.ebean.BaseTestCase;
import com.avaje.ebeaninternal.server.core.XmlConfigLoader;
import com.avaje.ebeaninternal.server.lib.util.Dnode;
import org.apache.commons.io.IOUtils;
import org.junit.Assert;
import org.junit.Test;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
/**
* Tests basic xml loading functionality across multiple jars and inside our own test structure.
*
* @author Rob Bygrave
* @author Richard Vowles - http://plus.google.com/RichardVowles
*/
public class TestXmlConfigLoader extends BaseTestCase {
@Test
public void test() {
XmlConfigLoader xmlConfigLoader = new XmlConfigLoader(null);
List<Dnode> ebeanOrmXml = xmlConfigLoader.search(META_INF_EBEAN_ORM_XML);
Assert.assertNotNull(ebeanOrmXml);
Assert.assertTrue("Found ebean-orm.xml", ebeanOrmXml.size() > 0);
}
private static final String META_INF_EBEAN_ORM_XML = "META-INF/ebean-orm.xml";
private static final String META_INF_ORM_XML = "META-INF/orm.xml";
private static final String WEB_INF_CLASSES = "WEB-INF/classes/";
@Test
public void ensureEbeanOrmStillLoads() throws IOException {
URL jar = setupJar();
URL jarBang = setupJarBang();
URLClassLoader cl = new URLClassLoader(new URL[] { jar, jarBang}, getClass().getClassLoader());
XmlConfigLoader loader = new XmlConfigLoader(cl);
Assert.assertEquals(3, loader.search(META_INF_EBEAN_ORM_XML).size()); // 1 in parent, 2 in ours
Assert.assertEquals(2, loader.search(META_INF_ORM_XML).size()); // 2 in ours
}
private URL createJar(File jarFile, String offset) throws IOException {
FileOutputStream stream = new FileOutputStream(jarFile);
JarOutputStream jarOutputStream = new JarOutputStream(stream);
JarEntry entry = new JarEntry(offset + META_INF_EBEAN_ORM_XML);
jarOutputStream.putNextEntry(entry);
InputStream classStream = getClass().getResourceAsStream("/" + META_INF_EBEAN_ORM_XML);
IOUtils.copy(classStream, jarOutputStream);
entry = new JarEntry(offset + META_INF_ORM_XML);
jarOutputStream.putNextEntry(entry);
classStream = getClass().getResourceAsStream("/" + META_INF_EBEAN_ORM_XML);
IOUtils.copy(classStream, jarOutputStream);
jarOutputStream.close();
stream.close();
if (offset.length() > 0) {
return new URL("jar:" + jarFile.toURI().toString() + "!/" + offset);
} else {
return jarFile.toURI().toURL();
}
}
private URL setupJarBang() throws IOException {
File jarFile = File.createTempFile("bang", ".war");
return createJar(jarFile, WEB_INF_CLASSES);
}
private URL setupJar() throws IOException {
File jarFile = File.createTempFile("nobang", ".jar");
return createJar(jarFile, "");
}
}