diff --git a/src/test/java/com/avaje/ebean/elasticsearch/TestBasicPush.java b/src/test/java/com/avaje/ebean/elasticsearch/TestBasicPush.java index fff74ba0b..f070b63b6 100644 --- a/src/test/java/com/avaje/ebean/elasticsearch/TestBasicPush.java +++ b/src/test/java/com/avaje/ebean/elasticsearch/TestBasicPush.java @@ -61,11 +61,8 @@ public class TestBasicPush extends BaseTestCase { generator.close(); String json = writer.toString(); - System.out.println(json); - String response = post("http://localhost:9200/_bulk", json); - - System.out.println(response); + post("http://localhost:9200/_bulk", json); //curl -s -XPOST localhost:9200/_bulk diff --git a/src/test/java/com/avaje/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java b/src/test/java/com/avaje/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java index 366e8fee7..36543c8c7 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/changelog/ChangeJsonBuilderTest.java @@ -30,7 +30,7 @@ public class ChangeJsonBuilderTest extends BaseTestCase { for (int i = 0; i < changes.size(); i++) { StringWriter buffer = new StringWriter(); builder.writeBeanJson(buffer, changes.get(i), changeSet, i); - System.out.println(buffer.toString()); + assertThat(buffer.toString()).contains("\"source\""); assertThat(buffer.toString()).contains("\"userId\""); assertThat(buffer.toString()).contains("\"userIpAddress\""); diff --git a/src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java b/src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java index ff9dd416c..6539d0aae 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java +++ b/src/test/java/com/avaje/ebeaninternal/server/deploy/DeployPropertyParserMapTests.java @@ -19,8 +19,6 @@ public class DeployPropertyParserMapTests { DeployPropertyParserMap parser = new DeployPropertyParserMap(map); String output = parser.parse("(lower(customer.name) like ? escape'' or id > ?)"); - - System.out.println(output); Assert.assertEquals("(lower(t1.name) like ? escape'' or t0.id > ?)", output); } diff --git a/src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMax.java b/src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMax.java index f32121705..4283609ba 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMax.java +++ b/src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMax.java @@ -49,8 +49,6 @@ public class TestDataSourceMax extends BaseTestCase { bg.execute(new ConnRunner(pool, 4000, i)); } - System.out.println("main thread sleep ... " + pool.getStatus(false)); - Thread.sleep(10000); pool.getStatistics(true); @@ -81,9 +79,7 @@ public class TestDataSourceMax extends BaseTestCase { private void waitSomeTime(long count) { try { - System.out.println(position+" sleep " + sleepMillis+" count:"+count); Thread.sleep(sleepMillis); - System.out.println(position+" sleep done"); } catch (InterruptedException e){ throw new RuntimeException(e); } diff --git a/src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java b/src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java index dacd2b19a..5ea6bdcfa 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java +++ b/src/test/java/com/avaje/ebeaninternal/server/lib/sql/TestDataSourceMaxWithEntity.java @@ -30,9 +30,6 @@ public class TestDataSourceMaxWithEntity extends BaseTestCase { bg.execute(new ConnRunner(server, 4000, i)); } - System.out.println("main thread sleep ... "); - - Thread.sleep(30000); server.shutdown(true, false); diff --git a/src/test/java/com/avaje/ebeaninternal/server/rawsql/TestRawSqlParsing.java b/src/test/java/com/avaje/ebeaninternal/server/rawsql/TestRawSqlParsing.java index ee68afc43..c80637069 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/rawsql/TestRawSqlParsing.java +++ b/src/test/java/com/avaje/ebeaninternal/server/rawsql/TestRawSqlParsing.java @@ -24,7 +24,6 @@ public class TestRawSqlParsing extends TestCase { Sql rs = rawSql.getSql(); String s = rs.toString(); - System.out.println(s); assertTrue(s, s.contains("[order_id, sum")); } diff --git a/src/test/java/com/avaje/ebeaninternal/server/text/json/TestJsonWriteVisitor.java b/src/test/java/com/avaje/ebeaninternal/server/text/json/TestJsonWriteVisitor.java index 2c29e4c61..3b43323c8 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/text/json/TestJsonWriteVisitor.java +++ b/src/test/java/com/avaje/ebeaninternal/server/text/json/TestJsonWriteVisitor.java @@ -42,7 +42,6 @@ public class TestJsonWriteVisitor extends BaseTestCase { options.setPathVisitor("contacts", new ContactVisitor()); String jsonContent = json.toJson(list, options); - System.out.println(jsonContent); assertThat(jsonContent).contains("customerExtra"); assertThat(jsonContent).contains("contactExtra"); diff --git a/src/test/java/com/avaje/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java b/src/test/java/com/avaje/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java index 420b0b91f..9341e3d3d 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java +++ b/src/test/java/com/avaje/ebeaninternal/server/text/json/TestTextJsonBeanReadVisitor.java @@ -42,14 +42,11 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase { options.addVisitor("shippingAddress", new ASVisitor()); String s = json.toJson(list); - System.out.println(s); List mList = json.toList(Customer.class, s, options); - System.out.println("VIA STRING: " + mList); StringReader reader = new StringReader(s); List mList2 = json.toList(Customer.class, reader); - System.out.println("VIA READER: " + mList2); assertEquals(mList.size(), mList2.size()); } @@ -58,28 +55,28 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase { @Override public void visit(Customer bean, Map unmapped) { - System.out.println("visit customer: " + bean); + bean.getId(); } } private static class AVisitor implements JsonReadBeanVisitor
{ public void visit(Address bean, Map unmapped) { - System.out.println("visit billing address: " + bean); + bean.getId(); } } private static class ASVisitor implements JsonReadBeanVisitor
{ public void visit(Address bean, Map unmapped) { - System.out.println("visit shipping address: " + bean); + bean.getId(); } } private static class ContactVisitor implements JsonReadBeanVisitor { public void visit(Contact bean, Map unmapped) { - System.out.println("visit contact: " + bean); + bean.getId(); } } } diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTest.java index 4cd1bc0ae..f556822f0 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/type/ScalarTypeLocalDateTest.java @@ -17,8 +17,6 @@ public class ScalarTypeLocalDateTest { LocalDate date = LocalDate.of(2014, 5, 20); long millis = type.convertToMillis(date); - System.out.println(date); - LocalDate parseDate = type.convertFromMillis(millis); assertEquals(date, parseDate); } diff --git a/src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java b/src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java index 674490eb0..7b7768ba2 100644 --- a/src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java +++ b/src/test/java/com/avaje/tests/autofetch/MainAutoQueryTune1.java @@ -27,7 +27,8 @@ public class MainAutoQueryTune1 { .findList(); for (Order order : list) { - System.out.println(order.getId() + " " + order.getOrderDate()); + order.getId(); + order.getOrderDate(); } } } diff --git a/src/test/java/com/avaje/tests/basic/TestBatchLazyMany.java b/src/test/java/com/avaje/tests/basic/TestBatchLazyMany.java index 754486f52..d3cbe44dc 100644 --- a/src/test/java/com/avaje/tests/basic/TestBatchLazyMany.java +++ b/src/test/java/com/avaje/tests/basic/TestBatchLazyMany.java @@ -16,8 +16,7 @@ public class TestBatchLazyMany extends BaseTestCase { Order order2 = Ebean.getReference(Order.class, 1); order2.getOrderDate(); - System.out.println("done"); - + // List list = Ebean.find(Order.class) // //.join("details") // //.join("details", "+fetchquery") diff --git a/src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java b/src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java index 1f85d168a..9a1f48d9e 100644 --- a/src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java +++ b/src/test/java/com/avaje/tests/basic/TestBeanReferenceRefresh.java @@ -47,8 +47,6 @@ public class TestBeanReferenceRefresh extends BaseTestCase { Status statusRefresh = order.getStatus(); Assert.assertEquals(status,statusRefresh); - System.out.println("done"); - } diff --git a/src/test/java/com/avaje/tests/basic/TestDeleteImportedPartial.java b/src/test/java/com/avaje/tests/basic/TestDeleteImportedPartial.java index 678c1431f..6998dfaa6 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeleteImportedPartial.java +++ b/src/test/java/com/avaje/tests/basic/TestDeleteImportedPartial.java @@ -24,7 +24,6 @@ public class TestDeleteImportedPartial extends BaseTestCase { // should delete file and fileContent Ebean.delete(partialPfile); - System.out.println("finished delete"); PFile file1 = Ebean.find(PFile.class, id); PFileContent content1 = Ebean.find(PFileContent.class, contentId); diff --git a/src/test/java/com/avaje/tests/basic/TestDeleteOneToOneMultiple.java b/src/test/java/com/avaje/tests/basic/TestDeleteOneToOneMultiple.java index d539c8143..872ccf155 100644 --- a/src/test/java/com/avaje/tests/basic/TestDeleteOneToOneMultiple.java +++ b/src/test/java/com/avaje/tests/basic/TestDeleteOneToOneMultiple.java @@ -26,7 +26,6 @@ public class TestDeleteOneToOneMultiple extends BaseTestCase { // should delete file and fileContent Ebean.delete(PFile.class, id); - System.out.println("finished delete"); PFile file1 = Ebean.find(PFile.class, id); PFileContent content1 = Ebean.find(PFileContent.class, contentId); diff --git a/src/test/java/com/avaje/tests/basic/TestFetchId.java b/src/test/java/com/avaje/tests/basic/TestFetchId.java index 7ac097517..c789411f3 100644 --- a/src/test/java/com/avaje/tests/basic/TestFetchId.java +++ b/src/test/java/com/avaje/tests/basic/TestFetchId.java @@ -36,14 +36,11 @@ public class TestFetchId extends BaseTestCase { List partial = futureIds.getPartialIds(); // this is likely 0 or a small number - System.out.println("partial: " + partial.size()); // wait for all the id's to be fetched List idList = futureIds.get(); Assert.assertTrue("same instance", partial == idList); Assert.assertTrue("sz > 0", ids.size() > 0); - System.out.println("ids: " + partial); - } } diff --git a/src/test/java/com/avaje/tests/basic/TestM2MCascadeOne.java b/src/test/java/com/avaje/tests/basic/TestM2MCascadeOne.java index dab31b421..c47707342 100644 --- a/src/test/java/com/avaje/tests/basic/TestM2MCascadeOne.java +++ b/src/test/java/com/avaje/tests/basic/TestM2MCascadeOne.java @@ -19,13 +19,7 @@ public class TestM2MCascadeOne extends BaseTestCase { MUser u = new MUser(); u.setUserName("testM2M"); - List roles = u.getRoles(); - if (roles != null) { - if (roles instanceof BeanList) { - System.out.println("enhancement checkNullManyFields=true successful"); - } - } - + u.getRoles(); Ebean.save(u); MRole r0 = new MRole(); diff --git a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java b/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java index 0a7d53001..0522de3c2 100644 --- a/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java +++ b/src/test/java/com/avaje/tests/basic/TestOrderTotalAmountReportBean.java @@ -20,14 +20,13 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase { List l0 = Ebean.find(OrderAggregate.class).findList(); for (OrderAggregate r0 : l0) { - System.out.println(r0); + r0.toString(); } List list = Ebean.createNamedQuery(OrderAggregate.class, "total.amount") .where().gt("order.id", 0).having().gt("totalAmount", 50).findList(); for (OrderAggregate r1 : list) { - System.out.println(r1); Assert.assertTrue(r1.getTotalAmount() > 20.50); // partial object query without totalItems // ... no lazy loading invoked on this type of bean @@ -38,7 +37,6 @@ public class TestOrderTotalAmountReportBean extends BaseTestCase { .having().lt("totalItems", 3).gt("totalAmount", 50).findList(); for (OrderAggregate r2 : l2) { - // System.out.println(r2); Assert.assertTrue(r2.getTotalItems() < 3); } diff --git a/src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java b/src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java index 738a19065..d86b41d22 100644 --- a/src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java +++ b/src/test/java/com/avaje/tests/basic/encrypt/TestEncrypt.java @@ -67,14 +67,12 @@ public class TestEncrypt extends BaseTestCase { q.setParameter("id", e.getId()); SqlRow row = q.findUnique(); - String name = row.getString("name"); - Object desc = row.get("description"); - System.out.println("SqlRow: " + name + " " + desc); + row.getString("name"); + row.get("description"); EBasicEncrypt e1 = Ebean.find(EBasicEncrypt.class, e.getId()); - String desc1 = e1.getDescription(); - System.out.println("Decrypted: " + desc1 + " " + e1.getDob()); + e1.getDescription(); e1.setName("testmod"); e1.setDescription("moddesc"); @@ -83,8 +81,7 @@ public class TestEncrypt extends BaseTestCase { EBasicEncrypt e2 = Ebean.find(EBasicEncrypt.class, e.getId()); - String desc2 = e2.getDescription(); - System.out.println("moddesc=" + desc2); + e2.getDescription(); SpiEbeanServer server = (SpiEbeanServer) Ebean.getServer(null); DbEncrypt dbEncrypt = server.getDatabasePlatform().getDbEncrypt(); diff --git a/src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java b/src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java index 5b615d7d2..25d86ba06 100644 --- a/src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java +++ b/src/test/java/com/avaje/tests/basic/encrypt/TestEncryptBinary.java @@ -29,18 +29,16 @@ public class TestEncryptBinary extends BaseTestCase { q.setParameter("id", e.getId()); SqlRow row = q.findUnique(); - String name = row.getString("name"); - Object data = row.get("data"); - Object someTimeData = row.get("some_time"); - System.out.println("SqlRow name:" + name + " data:" + data + " someTime:" + someTimeData); + row.getString("name"); + row.get("data"); + row.get("some_time"); EBasicEncryptBinary e1 = Ebean.find(EBasicEncryptBinary.class, e.getId()); Timestamp t1 = e1.getSomeTime(); - byte[] data1 = e1.getData(); - String s = new String(data1); - String desc1 = e1.getDescription(); - System.out.println("Decrypted data:" + s + " desc:" + desc1); + e1.getData(); + + e1.getDescription(); Assert.assertEquals(t0, t1); @@ -50,9 +48,7 @@ public class TestEncryptBinary extends BaseTestCase { Ebean.save(e1); EBasicEncryptBinary e2 = Ebean.find(EBasicEncryptBinary.class, e.getId()); - - String desc2 = e2.getDescription(); - System.out.println("moddesc=" + desc2); + e2.getDescription(); } } diff --git a/src/test/java/com/avaje/tests/basic/join/TestSecondaryJoin.java b/src/test/java/com/avaje/tests/basic/join/TestSecondaryJoin.java index 33b221479..3ae6ce458 100644 --- a/src/test/java/com/avaje/tests/basic/join/TestSecondaryJoin.java +++ b/src/test/java/com/avaje/tests/basic/join/TestSecondaryJoin.java @@ -27,9 +27,6 @@ public class TestSecondaryJoin extends BaseTestCase { o0.setStatus(Status.APPROVED); Ebean.save(o0); - - System.out.println("done"); - } } diff --git a/src/test/java/com/avaje/tests/basic/lob/TestByteOnly.java b/src/test/java/com/avaje/tests/basic/lob/TestByteOnly.java index 1ce5a64a3..df7da089c 100644 --- a/src/test/java/com/avaje/tests/basic/lob/TestByteOnly.java +++ b/src/test/java/com/avaje/tests/basic/lob/TestByteOnly.java @@ -23,10 +23,6 @@ public class TestByteOnly extends BaseTestCase { e2.setContent(content2); Ebean.save(e2); - - // Ebean.getServer(null).getAutoTune().collectProfiling(); - // Ebean.getServer(null).getAutoTune().updateTunedQueryInfo(); - System.out.println("done"); } } diff --git a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java b/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java index 0c72cf13d..4da0caef4 100644 --- a/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java +++ b/src/test/java/com/avaje/tests/batchload/TestBatchLazyWithCacheHits.java @@ -68,7 +68,7 @@ public class TestBatchLazyWithCacheHits extends BaseTestCase { .findList(); for (UUOne uuOne : list) { - System.out.println(uuOne.getName()); + uuOne.getName(); } list.get(0).getName(); diff --git a/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java b/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java index fe56914e0..46a172ac7 100644 --- a/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java +++ b/src/test/java/com/avaje/tests/cache/TestCacheCollectionIds.java @@ -71,10 +71,6 @@ public class TestCacheCollectionIds extends BaseTestCase { int currentNumContacts2 = fetchCustomer(customer.getId()); Assert.assertEquals(currentNumContacts + 1, currentNumContacts2); - System.out.println("custCache:" + custCache.getStatistics(false)); - System.out.println("contactCache:" + contactCache.getStatistics(false)); - System.out.println("custManyIdsCache:" + custManyIdsCache.getStatistics(false)); - } private int fetchCustomer(Integer id) { diff --git a/src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java b/src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java index e000471c9..cc0fd4be7 100644 --- a/src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java +++ b/src/test/java/com/avaje/tests/query/TestAutofetchTuneWithJoin.java @@ -53,8 +53,6 @@ public class TestAutofetchTuneWithJoin extends BaseTestCase { ObjectGraphNode parentNode = sq.getParentNode(); ObjectGraphOrigin origin = parentNode.getOriginQueryPoint(); - System.out.println("Origin:" + origin.getKey()); - // MetaAutoFetchStatistic metaAutoFetchStatistic = // ((DefaultOrmQuery)q).getMetaAutoFetchStatistic(); // if (metaAutoFetchStatistic != null) { @@ -65,9 +63,6 @@ public class TestAutofetchTuneWithJoin extends BaseTestCase { // System.out.println(queryStats); // } - if (q.isAutoTuned()) { - System.out.println("TUNED..."); - } } private static void collectUsage() { diff --git a/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java b/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java index e2c78c586..1948f8874 100644 --- a/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java +++ b/src/test/java/com/avaje/tests/query/TestManyWhereJoinM2M.java @@ -51,8 +51,7 @@ public class TestManyWhereJoinM2M extends BaseTestCase { // of a fetch join (if there is a fetch join) .where().eq("roles.roleName", "role2special").query(); - List list = query.findList(); - System.out.println(list); + query.findList(); String sql = query.getGeneratedSql(); Assert.assertTrue(sql.contains("select distinct")); diff --git a/src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java b/src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java index d68cf8b4d..981f1b134 100644 --- a/src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java +++ b/src/test/java/com/avaje/tests/query/TestOneToManyCorrectGrouping.java @@ -30,9 +30,8 @@ public class TestOneToManyCorrectGrouping extends BaseTestCase { int count = 0; while (customerQueryIterator.hasNext()) { Customer customer = customerQueryIterator.next(); - System.out.println(String.format("Customer id %s", customer.getId())); for (Order order : customer.getOrders()) { - System.out.println(String.format("--> Order id %s", order.getId())); + order.getId(); } count++; } diff --git a/src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java b/src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java index a6d1c1ab8..4c90a6ed3 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFetchSkipPath.java @@ -32,10 +32,9 @@ public class TestQueryFetchSkipPath extends BaseTestCase { Customer customer = order.getCustomer(); List contacts = customer.getContacts(); for (Contact contact : contacts) { - System.out.println("contact:" + contact); List notes = contact.getNotes(); for (ContactNote contactNote : notes) { - System.out.println("note:" + contactNote.getTitle()); + contactNote.getTitle(); } } } diff --git a/src/test/java/com/avaje/tests/query/TestQueryFilterManySimple.java b/src/test/java/com/avaje/tests/query/TestQueryFilterManySimple.java index abd450dbe..7ffaaaf86 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFilterManySimple.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFilterManySimple.java @@ -30,9 +30,7 @@ public class TestQueryFilterManySimple extends BaseTestCase { .filterMany("orders").eq("status", Order.Status.NEW).gt("orderDate", lastWeek) .filterMany("contacts").isNotNull("firstName").findList(); - System.out.println(list); // invoke lazy loading list.get(0).getOrders().size(); - System.out.println(list.get(0).getOrders()); } } diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java b/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java index f2379021b..0d0667d8c 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java @@ -89,7 +89,9 @@ public class TestQueryFindIterate extends BaseTestCase { while (queryIterator.hasNext()) { Order order = queryIterator.next(); Customer customer = order.getCustomer(); - System.out.println("order: " + order.getId() + " customerName:" + customer.getName()+" details:"+order.getDetails().size()+" shipments:"+order.getShipments().size()); + customer.getName(); + order.getDetails().size(); + order.getShipments().size(); } } finally { @@ -132,7 +134,10 @@ public class TestQueryFindIterate extends BaseTestCase { while (queryIterator.hasNext()) { Order order = queryIterator.next(); Customer customer = order.getCustomer(); - System.out.println("order: " + order.getId() + " customerName:" + customer.getName()+" details:"+order.getDetails().size()+" shipments:"+order.getShipments().size()); + order.getId(); + customer.getName(); + order.getDetails().size(); + order.getShipments().size(); } } finally { diff --git a/src/test/java/com/avaje/tests/query/TestRowCount.java b/src/test/java/com/avaje/tests/query/TestRowCount.java index 790d5cb56..b8b47c3b0 100644 --- a/src/test/java/com/avaje/tests/query/TestRowCount.java +++ b/src/test/java/com/avaje/tests/query/TestRowCount.java @@ -22,10 +22,8 @@ public class TestRowCount extends BaseTestCase { .gt("details.id", 1).order("id desc"); int rc = query.findRowCount(); - System.out.println("rc:" + rc); List ids = query.findIds(); - System.out.println("ids:" + ids); List list = query.findList(); System.out.println(list); diff --git a/src/test/java/com/avaje/tests/query/TestSubQuery.java b/src/test/java/com/avaje/tests/query/TestSubQuery.java index 0bfe31884..4053e3a82 100644 --- a/src/test/java/com/avaje/tests/query/TestSubQuery.java +++ b/src/test/java/com/avaje/tests/query/TestSubQuery.java @@ -15,6 +15,8 @@ import com.avaje.tests.model.basic.ResetBasicData; import com.avaje.tests.model.basic.Vehicle; import com.avaje.tests.model.basic.VehicleDriver; +import static org.assertj.core.api.StrictAssertions.assertThat; + public class TestSubQuery extends BaseTestCase { @Test @@ -30,18 +32,15 @@ public class TestSubQuery extends BaseTestCase { List list = Ebean.find(Order.class).where().in("id", sq).findList(); - System.out.println(list); // 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)) "; - List list2 = Ebean.createQuery(Order.class, oq).setParameter("prods", productIds) + Ebean.createQuery(Order.class, oq).setParameter("prods", productIds) .findList(); - System.out.println(list2); - // Assert.assertEquals(2,list2.size()); } @@ -59,10 +58,7 @@ public class TestSubQuery extends BaseTestCase { String golden = "(t0.one_key) in (select t0.one_key from ckey_parent t0) "; - if (!sql.contains(golden)) { - System.out.println("failed sql:" + sql); - Assert.fail("golden string not found"); - } + assertThat(sql).contains(golden); } /** @@ -102,16 +98,12 @@ public class TestSubQuery extends BaseTestCase { pq.findList(); String sql = pq.getGeneratedSql(); - System.err.println(sql); // TODO: If, after bugfixing, the system still join against vehicle I do not // know now, in our case, it is not necessary if not // using it in the where clause String golden = "(t0.id) in (select t0.vehicle_id from vehicle_driver t0 left outer join vehicle t1 on t1.id = t0.vehicle_id )"; - if (!sql.contains(golden)) { - System.out.println("failed sql:" + sql); - Assert.fail("golden string not found"); - } + assertThat(sql).contains(golden); } @@ -131,13 +123,8 @@ public class TestSubQuery extends BaseTestCase { pq.findList(); String sql = pq.getGeneratedSql(); - System.err.println(sql); - String golden = "(t0.id) in (select t0.vehicle_id from vehicle_driver t0 left outer join vehicle t1 on t1.id = t0.vehicle_id where t1.license_number = ? )"; - if (!sql.contains(golden)) { - System.out.println("failed sql:" + sql); - Assert.fail("golden string not found"); - } + assertThat(sql).contains(golden); } /** @@ -157,15 +144,8 @@ public class TestSubQuery extends BaseTestCase { pq.findList(); String sql = pq.getGeneratedSql(); - System.err.println(sql); String golden = "(t0.id) in (select t0.vehicle_id from vehicle_driver t0 left outer join vehicle t1 on t1.id = t0.vehicle_id )"; - // OR without join - // String golden = - // "(t0.id) in (select t0.vehicle_id from vehicle_driver t0)"; - if (!sql.contains(golden)) { - System.out.println("failed sql:" + sql); - Assert.fail("golden string not found"); - } + assertThat(sql).contains(golden); } } diff --git a/src/test/java/com/avaje/tests/query/autotune/TestAutoTuneProfiling.java b/src/test/java/com/avaje/tests/query/autotune/TestAutoTuneProfiling.java index df36e07ca..c4491e3be 100644 --- a/src/test/java/com/avaje/tests/query/autotune/TestAutoTuneProfiling.java +++ b/src/test/java/com/avaje/tests/query/autotune/TestAutoTuneProfiling.java @@ -21,28 +21,20 @@ public class TestAutoTuneProfiling extends BaseTestCase { ResetBasicData.reset(); - System.out.println("Start ......."); - for (int i = 0; i < 1; i++) { execute(); } collectUsage(); - System.out.println("Sleeping ..."); sortOfBusy(); - System.out.println("Run after collection"); - for (int i = 0; i < 10; i++) { execute(); } collectUsage(); - System.out.println("Sleeping ..."); sortOfBusy(); - System.out.println("Run after collection"); - for (int i = 0; i < 1; i++) { execute(); } diff --git a/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java b/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java index 4d0f40bcc..3d0b2167d 100644 --- a/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java +++ b/src/test/java/com/avaje/tests/query/lazy/TestQueryDefaultBatchSize.java @@ -104,9 +104,9 @@ public class TestQueryDefaultBatchSize extends BaseTestCase { private void doStuff(Order order) { // invoke lazy loading Customer customer = order.getCustomer(); - System.out.println("do stuff: order:"+order.getId()); - System.out.println("... customer:"+customer.getName()); - - System.out.println("... contacts: "+customer.getContacts().size()+" details:"+order.getDetails().size()); + order.getId(); + customer.getName(); + customer.getContacts().size(); + order.getDetails().size(); } } diff --git a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinctTake2.java b/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinctTake2.java index 04fc36e6d..94fc644bd 100644 --- a/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinctTake2.java +++ b/src/test/java/com/avaje/tests/query/orderby/TestOrderByWithDistinctTake2.java @@ -16,7 +16,6 @@ public class TestOrderByWithDistinctTake2 extends BaseTestCase { String test = "helloasc asc ASC desc DESC boodesc desc ASC"; test = test.replaceAll("(?i)\\b asc\\b|\\b desc\\b", ""); - System.out.println(test); Assert.assertEquals("helloasc boodesc", test); } diff --git a/src/test/java/com/avaje/tests/query/other/TestFindPartialWithConstructorSetFields.java b/src/test/java/com/avaje/tests/query/other/TestFindPartialWithConstructorSetFields.java index faabdb1b5..4e4ae9e25 100644 --- a/src/test/java/com/avaje/tests/query/other/TestFindPartialWithConstructorSetFields.java +++ b/src/test/java/com/avaje/tests/query/other/TestFindPartialWithConstructorSetFields.java @@ -39,9 +39,8 @@ public class TestFindPartialWithConstructorSetFields extends BaseTestCase { assertTrue(!loadedProps.contains("orderDate")); // invoke lazy loading - Status status = order0.getStatus(); - Date orderDate = order0.getOrderDate(); - System.out.println("-- order - "+order0.getId()+" status:"+status+" date:"+orderDate); + order0.getStatus(); + order0.getOrderDate(); // assert that these beans are fully loaded for (int i = 1; i < list.size(); i++) { diff --git a/src/test/java/com/avaje/tests/query/other/TestManyToManyLazyLoading.java b/src/test/java/com/avaje/tests/query/other/TestManyToManyLazyLoading.java index acedb06ec..3bdad0fc0 100644 --- a/src/test/java/com/avaje/tests/query/other/TestManyToManyLazyLoading.java +++ b/src/test/java/com/avaje/tests/query/other/TestManyToManyLazyLoading.java @@ -20,7 +20,7 @@ public class TestManyToManyLazyLoading extends BaseTestCase { for (MUser user : users) { List roles = user.getRoles(); - System.out.println(""+roles.size()); + roles.size(); } } diff --git a/src/test/java/com/avaje/tests/query/other/TestObjectGraphNodeStatsCollection.java b/src/test/java/com/avaje/tests/query/other/TestObjectGraphNodeStatsCollection.java index 1bbf45019..c9efc59f5 100644 --- a/src/test/java/com/avaje/tests/query/other/TestObjectGraphNodeStatsCollection.java +++ b/src/test/java/com/avaje/tests/query/other/TestObjectGraphNodeStatsCollection.java @@ -28,7 +28,6 @@ public class TestObjectGraphNodeStatsCollection extends BaseTestCase { MetaInfoManager infoManager = server.getMetaInfoManager(); - server.find(Order.class).findRowCount(); infoManager.collectNodeStatistics(true); @@ -37,26 +36,16 @@ public class TestObjectGraphNodeStatsCollection extends BaseTestCase { runFindOrderQuery(server); runFindCustomerQuery(server); - System.out.println("============================================================"); - List nodeStatistics = infoManager.collectNodeStatistics(true); for (MetaObjectGraphNodeStats stat : nodeStatistics) { - System.out.println("-----------"); - System.out.println(stat); + stat.toString(); } - System.out.println("============================================================"); - List planStatistics = infoManager.collectQueryPlanStatistics(true); for (MetaQueryPlanStatistic planStatistic : planStatistics) { - System.out.println("------------"); - System.out.println(planStatistic); - System.out.println(planStatistic.getSql()); + planStatistic.getSql(); } - System.out.println("============================================================"); - - } private void runFindCustomerQuery(EbeanServer server) { diff --git a/src/test/java/com/avaje/tests/query/other/TestSelfParent.java b/src/test/java/com/avaje/tests/query/other/TestSelfParent.java index b8c422254..9d42bf022 100644 --- a/src/test/java/com/avaje/tests/query/other/TestSelfParent.java +++ b/src/test/java/com/avaje/tests/query/other/TestSelfParent.java @@ -47,7 +47,7 @@ public class TestSelfParent extends BaseTestCase { } public static void printNode(SelfParent o) { - System.out.println(o.getName()); + //System.out.println(o.getName()); for (SelfParent c : o.getChildren()) { printNode(c); } diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlMasterDetail.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlMasterDetail.java index 9827a49ef..c2655dd85 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlMasterDetail.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlMasterDetail.java @@ -155,16 +155,15 @@ public class TestRawSqlMasterDetail extends BaseTestCase { } private void printOrders(List orders, String heading) { - System.out.println("-------------- "+heading); + for (Order order : orders) { List details = order.getDetails(); - System.out.println("order: "+order.getId()+" "+order.getCustomer().getName()); + order.getCustomer().getName(); for (OrderDetail detail : details) { - System.out.println("detailId:" + detail.getId() + " productId:" + detail.getProduct().getId() + " qty:" + - detail.getOrderQty()); + detail.getProduct().getId(); + detail.getOrderQty(); } } - System.out.println("-------------- "+heading+" complete"); } } diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper.java index 3949a687a..3bfabccec 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper.java @@ -56,14 +56,15 @@ public class TestRawSqlOrmWrapper extends BaseTestCase { private void output(List list) { for (OrderAggregate oa : list) { - Double totalAmount = oa.getTotalAmount(); + Order order = oa.getOrder(); - Integer id = order.getId(); - Status status = order.getStatus(); - System.out.println("Order: " + id + " " + status + " total:" + totalAmount); + order.getId(); + order.getStatus(); + oa.getTotalAmount(); Customer c = order.getCustomer(); - System.out.println(" -> customer: " + c.getId() + " " + c.getName()); + c.getId(); + c.getName(); // invoke lazy loading as this property // has not populated originally diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper2.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper2.java index c9addbf03..183a0dba1 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper2.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper2.java @@ -40,10 +40,9 @@ public class TestRawSqlOrmWrapper2 extends BaseTestCase { Assert.assertNotNull(list); for (OrderAggregate oa : list) { - Double totalAmount = oa.getTotalAmount(); + oa.getTotalAmount(); Order order = oa.getOrder(); - Integer id = order.getId(); - System.out.println("Order: " + id + " total:" + totalAmount); + order.getId(); } } diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper3.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper3.java index 5fddb439c..77e51ae74 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper3.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlOrmWrapper3.java @@ -49,14 +49,14 @@ public class TestRawSqlOrmWrapper3 extends BaseTestCase { private void output(List list) { for (OrderAggregate oa : list) { - Double totalAmount = oa.getTotalAmount(); + oa.getTotalAmount(); Order order = oa.getOrder(); - Integer id = order.getId(); - Status status = order.getStatus(); - System.out.println("Order: " + id + " " + status + " total:" + totalAmount); + order.getId(); + order.getStatus(); Customer c = order.getCustomer(); - System.out.println(" -> customer: " + c.getId() + " " + c.getName()); + c.getId(); + c.getName(); // invoke lazy loading as this property // has not populated originally diff --git a/src/test/java/com/avaje/tests/rawsql/TestRawSqlWithResultSet.java b/src/test/java/com/avaje/tests/rawsql/TestRawSqlWithResultSet.java index c84e906ef..32bef08ef 100644 --- a/src/test/java/com/avaje/tests/rawsql/TestRawSqlWithResultSet.java +++ b/src/test/java/com/avaje/tests/rawsql/TestRawSqlWithResultSet.java @@ -43,7 +43,9 @@ public class TestRawSqlWithResultSet extends BaseTestCase { .findList(); for (Customer customer : list) { - System.out.println("id:"+customer.getId()+" name:"+customer.getName()+" billingAddress:"+customer.getBillingAddress()); + customer.getId(); + customer.getName(); + customer.getBillingAddress(); } } finally { diff --git a/src/test/java/com/avaje/tests/refresh/TestRefreshWithMany.java b/src/test/java/com/avaje/tests/refresh/TestRefreshWithMany.java index ef0d80f1f..8a3bb834a 100644 --- a/src/test/java/com/avaje/tests/refresh/TestRefreshWithMany.java +++ b/src/test/java/com/avaje/tests/refresh/TestRefreshWithMany.java @@ -37,9 +37,7 @@ public class TestRefreshWithMany extends BaseTestCase { assertEquals(1, rc); assertEquals(3, rc2); - System.out.println("-------------------------- prior"); Ebean.refresh(customer); - System.out.println("-------------------------- after"); assertEquals("ref-modified", customer.getName()); assertEquals(3, customer.getContacts().size()); @@ -65,22 +63,22 @@ public class TestRefreshWithMany extends BaseTestCase { List sqlRows = Ebean.createSqlQuery("select id, first_name, last_name from contact").findList(); for (SqlRow sqlRow : sqlRows) { - System.out.println("row: "+sqlRow.get("id")+" "+sqlRow.get("first_name")+" "+sqlRow.get("last_name")); + sqlRow.get("id"); + sqlRow.get("first_name"); + sqlRow.get("last_name"); } assertEquals(1, rcb1); assertEquals(3, rcb2); - System.out.println("-------------------------- prior2"); Ebean.refresh(customer1); - System.out.println("-------------------------- after2"); assertEquals("ref-modified-again", customer1.getName()); - System.out.println("-------------------------- after2a"); assertEquals(3, customer1.getContacts().size()); - System.out.println("-------------------------- after2b"); for (Contact contact : customer1.getContacts()) { - System.out.println("hello "+contact.getId()+" "+contact.getFirstName()+" "+contact.getLastName()); + contact.getId(); + contact.getFirstName(); + contact.getLastName(); } assertEquals(true, customer1.getContacts().get(0).getFirstName().endsWith("-alt")); diff --git a/src/test/java/com/avaje/tests/text/csv/TestCsvReaderWithCallback.java b/src/test/java/com/avaje/tests/text/csv/TestCsvReaderWithCallback.java index 32e797c6c..a31ab0203 100644 --- a/src/test/java/com/avaje/tests/text/csv/TestCsvReaderWithCallback.java +++ b/src/test/java/com/avaje/tests/text/csv/TestCsvReaderWithCallback.java @@ -49,8 +49,6 @@ public class TestCsvReaderWithCallback extends BaseTestCase { @Override public void processBean(int row, String[] lineContent, Customer cust) { - System.out.println(row + "> " + cust + " " + cust.getBillingAddress()); - server.save(cust.getBillingAddress(), transaction); server.save(cust, transaction); } diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonMap.java b/src/test/java/com/avaje/tests/text/json/TestJsonMap.java index 22e1d5c58..618f4db43 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonMap.java +++ b/src/test/java/com/avaje/tests/text/json/TestJsonMap.java @@ -46,13 +46,11 @@ public class TestJsonMap extends BaseTestCase { JsonContext jsonContext = Ebean.json(); JsonWriteOptions options = JsonWriteOptions.parsePath("(id,status,name)"); - String jsonString = jsonContext.toJson(map, options); - System.out.println(jsonString); + jsonContext.toJson(map, options); options = JsonWriteOptions.parsePath("(id,status,name,shippingAddress(id,line1,city),billingAddress(*),contacts(*))"); - jsonString = jsonContext.toJson(map, options); - System.out.println(jsonString); +` jsonContext.toJson(map, options); // Assert.assertTrue(jsonString.indexOf("{\"1\":") > -1); // Assert.assertTrue(jsonString.indexOf("{\"id\":1,\"status\":\"NEW\",\"name\":\"Rob\"},") @@ -72,9 +70,7 @@ public class TestJsonMap extends BaseTestCase { .apply(pathProperties) .findList(); - String jsonString = Ebean.json().toJson(customers, pathProperties); - System.out.println(jsonString); - + Ebean.json().toJson(customers, pathProperties); // Assert.assertTrue(jsonString.indexOf("{\"1\":") > -1); // Assert.assertTrue(jsonString.indexOf("{\"id\":1,\"status\":\"NEW\",\"name\":\"Rob\"},") diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonSimple.java b/src/test/java/com/avaje/tests/text/json/TestJsonSimple.java index d534584fa..8e588564a 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonSimple.java +++ b/src/test/java/com/avaje/tests/text/json/TestJsonSimple.java @@ -38,7 +38,6 @@ public class TestJsonSimple extends BaseTestCase { String jsonText = sb.toString(); Object el = EJson.parse(jsonText); - System.out.println("Got " + el); Map e2 = EJson.parseObject("{\"a\":12, \"name\":{\"first\":\"rob\", \"last\":\"byg\"}}"); @@ -50,8 +49,7 @@ public class TestJsonSimple extends BaseTestCase { m.put("test", "me"); JsonContext jsonContext = Ebean.json(); - String jsonString = jsonContext.toJson(m); - System.out.println(jsonString); + jsonContext.toJson(m); String s = "{\"parishId\":\"18\",\"contentId\":null,\"contentStatus\":null,\"contentType\":\"pg-hello\",\"content\":\"asd\"}"; diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java index 57b966cf9..77c4e9489 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonBeanReadVisitor.java @@ -31,14 +31,11 @@ public class TestTextJsonBeanReadVisitor extends BaseTestCase { String s = json.toJson(list); - System.out.println(s); List mList = json.toList(Customer.class, s); - System.out.println("VIA STRING: " + mList); StringReader reader = new StringReader(s); List mList2 = json.toList(Customer.class, reader); - System.out.println("VIA READER: " + mList2); Assert.assertEquals(mList.size(), mList2.size()); } diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java index e4f626c85..fc567be68 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonInheritance.java @@ -30,7 +30,6 @@ public class TestTextJsonInheritance extends BaseTestCase { JsonContext jsonContext = Ebean.json(); String jsonString = jsonContext.toJson(list); - System.out.println(jsonString); List rebuiltList = jsonContext.toList(Vehicle.class, jsonString); diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonInvokeLazy.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonInvokeLazy.java index 80d518de7..cb785a72d 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonInvokeLazy.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonInvokeLazy.java @@ -24,9 +24,6 @@ public class TestTextJsonInvokeLazy extends BaseTestCase { JsonWriteOptions opt = JsonWriteOptions.parsePath("name, status"); JsonContext jsonContext = Ebean.json(); - String jsonString = jsonContext.toJson(list, opt); - - System.out.println(jsonString); - + jsonContext.toJson(list, opt); } } diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonReadManyLazyLoad.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonReadManyLazyLoad.java index f30ad6905..df7014606 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonReadManyLazyLoad.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonReadManyLazyLoad.java @@ -31,9 +31,7 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase { JsonWriteOptions o = new JsonWriteOptions(); o.setPathProperties(pp); - System.out.println("Expect lazy loading of Customer beans and customer contacts"); String s = json.toJson(list, o); - System.out.println(s); Assert.assertTrue(s.contains("\"contacts\"")); Assert.assertTrue(s.contains("\"name\"")); @@ -54,9 +52,7 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase { JsonWriteOptions o = new JsonWriteOptions(); o.setPathProperties(pp); - System.out.println("expecting lazy load of Customer beans to fetch customer name"); String s = json.toJson(list, o); - System.out.println(s); Assert.assertTrue(s.contains("\"contacts\"")); Assert.assertTrue(s.contains("\"name\"")); @@ -78,9 +74,7 @@ public class TestTextJsonReadManyLazyLoad extends BaseTestCase { JsonWriteOptions o = new JsonWriteOptions(); o.setPathProperties(pp); - System.out.println("expecting lazy load of Customer contacts "); String s = json.toJson(list, o); - System.out.println(s); Assert.assertTrue(s.contains("\"contacts\"")); Assert.assertTrue(s.contains("\"name\"")); diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonReferenceBean.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonReferenceBean.java index 43c0549d7..fea42d6b6 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonReferenceBean.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonReferenceBean.java @@ -39,7 +39,6 @@ public class TestTextJsonReferenceBean extends BaseTestCase { } else { String jsonString = jsonContext.toJson(product); - System.out.println(jsonString); Product refProd = jsonContext.toBean(Product.class, jsonString); @@ -71,7 +70,6 @@ public class TestTextJsonReferenceBean extends BaseTestCase { JsonWriteOptions options = JsonWriteOptions.parsePath("*,details(id,orderQty,product(id))"); String jsonOrder = jsonContext.toJson(order, options); - System.out.println(jsonOrder); Order o2 = jsonContext.toBean(Order.class, jsonOrder); Customer customer = o2.getCustomer(); diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonSimple.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonSimple.java index 30a039d75..47767bd08 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonSimple.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonSimple.java @@ -71,7 +71,6 @@ public class TestTextJsonSimple extends BaseTestCase { JsonContext json = server.json(); String jsonOutput = json.toJson(list); - System.out.println(jsonOutput); // check that transient fields are included by default in the JSON output Assert.assertTrue(jsonOutput.contains("\"selected\":")); @@ -109,7 +108,6 @@ public class TestTextJsonSimple extends BaseTestCase { // not using pathProperties - includes transient fields by default String jsonOutput = json.toJson(list); - System.out.println(jsonOutput); // check that transient fields are included by default in the JSON output Assert.assertTrue(jsonOutput.contains("\"selected\":")); @@ -133,14 +131,12 @@ public class TestTextJsonSimple extends BaseTestCase { PathProperties pathProperties = PathProperties.parse("(id,name,selected)"); String jsonOutput = json.toJson(list, pathProperties); - System.out.println(jsonOutput); // check that transient fields are included by explicit pathProperties Assert.assertTrue(jsonOutput.contains("\"selected\":")); pathProperties = PathProperties.parse("(id,name)"); jsonOutput = json.toJson(list, pathProperties); - System.out.println(jsonOutput); // check that transient fields are NOT included when explicitly excluded by pathProperties Assert.assertFalse(jsonOutput.contains("\"selected\":")); diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonSuperSimple.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonSuperSimple.java index db054b7bd..f46ff2963 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonSuperSimple.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonSuperSimple.java @@ -31,7 +31,6 @@ public class TestTextJsonSuperSimple extends BaseTestCase { Customer customer = list.get(0); String s = json.toJson(customer); - System.out.println(s); int statusPos = s.indexOf("status"); Assert.assertEquals(-1, statusPos); } diff --git a/src/test/java/com/avaje/tests/text/json/TestTextJsonUpdateCascade.java b/src/test/java/com/avaje/tests/text/json/TestTextJsonUpdateCascade.java index de94792d8..ffd599d4a 100644 --- a/src/test/java/com/avaje/tests/text/json/TestTextJsonUpdateCascade.java +++ b/src/test/java/com/avaje/tests/text/json/TestTextJsonUpdateCascade.java @@ -59,7 +59,6 @@ public class TestTextJsonUpdateCascade extends BaseTestCase { JsonContext jsonContext = server.json(); String jsonString = jsonContext.toJson(order); - System.out.println(jsonString); Order updOrder = jsonContext.toBean(Order.class, jsonString); @@ -85,9 +84,7 @@ public class TestTextJsonUpdateCascade extends BaseTestCase { Ebean.save(u0); - String jsonUser = jsonContext.toJson(u0); - - System.out.println(jsonUser); + jsonContext.toJson(u0); String s = "{\"userid\":" + u0.getUserid() + ",\"userName\":\"userj1\", \"roles\":[{\"roleid\":" + r2.getRoleid() + "},{\"roleid\":" diff --git a/src/test/java/com/avaje/tests/transaction/TestPersistContextClear.java b/src/test/java/com/avaje/tests/transaction/TestPersistContextClear.java index 0f67b493d..b79c30348 100644 --- a/src/test/java/com/avaje/tests/transaction/TestPersistContextClear.java +++ b/src/test/java/com/avaje/tests/transaction/TestPersistContextClear.java @@ -28,8 +28,6 @@ public class TestPersistContextClear extends BaseTestCase { SpiTransaction spiTxn = (SpiTransaction) t; PersistenceContext pc = spiTxn.getPersistenceContext(); - System.out.println("pc0:" + pc.toString()); - // no orders or customers in the PC Assert.assertEquals(0, pc.size(Order.class)); Assert.assertEquals(0, pc.size(Customer.class)); @@ -46,7 +44,6 @@ public class TestPersistContextClear extends BaseTestCase { // keep a hold of one of them order0 = list.get(0); - System.out.println("pc1:" + pc.toString()); Assert.assertEquals(orderSize, pc.size(Order.class)); System.gc(); @@ -67,7 +64,6 @@ public class TestPersistContextClear extends BaseTestCase { } System.gc(); - System.out.println("pc4:" + pc.toString()); // we still have the order Assert.assertNotNull(order0); diff --git a/src/test/java/com/avaje/tests/types/TestFileType.java b/src/test/java/com/avaje/tests/types/TestFileType.java index cd6db437f..c08dce4eb 100644 --- a/src/test/java/com/avaje/tests/types/TestFileType.java +++ b/src/test/java/com/avaje/tests/types/TestFileType.java @@ -43,8 +43,6 @@ public class TestFileType extends BaseTestCase { assertEquals("afile", bean2.getName()); assertNotNull(bean2.getContent()); - System.out.println("test_insertNullFile: bean2: "+bean2.getContent()); - Ebean.delete(bean1); } @@ -68,7 +66,6 @@ public class TestFileType extends BaseTestCase { assertEquals("afile", bean1.getName()); assertNotNull(bean1.getContent()); assertEquals(file.length(), bean1.getContent().length()); - System.out.println("t2 bean1: " + bean1.getContent().getAbsoluteFile()); bean1.setName("mod-file"); bean1.setContent(file2); @@ -82,7 +79,6 @@ public class TestFileType extends BaseTestCase { .findUnique(); assertEquals(file2.length(), bean2.getContent().length()); - System.out.println("t2 bean3: " + bean2.getContent().getAbsoluteFile()); // update to null bean2.setContent(null); @@ -95,7 +91,6 @@ public class TestFileType extends BaseTestCase { .findUnique(); assertNull(bean3.getContent()); - System.out.println("t2 bean3: " + bean3.getContent()); bean3.setName("changeOnlyName"); Ebean.save(bean3); diff --git a/src/test/java/com/avaje/tests/types/TestNewTypes.java b/src/test/java/com/avaje/tests/types/TestNewTypes.java index 574d4c63e..bd807b189 100644 --- a/src/test/java/com/avaje/tests/types/TestNewTypes.java +++ b/src/test/java/com/avaje/tests/types/TestNewTypes.java @@ -82,7 +82,6 @@ public class TestNewTypes extends BaseTestCase { assertEquals(bean.getInstant(), fetched.getInstant()); String asJson = Ebean.json().toJson(fetched); - System.out.println(asJson); SomeNewTypesBean toBean = Ebean.json().toBean(SomeNewTypesBean.class, asJson); diff --git a/src/test/java/com/avaje/tests/unitinternal/HelloMain.java b/src/test/java/com/avaje/tests/unitinternal/HelloMain.java index 0cf57ecd0..50a5f52c9 100644 --- a/src/test/java/com/avaje/tests/unitinternal/HelloMain.java +++ b/src/test/java/com/avaje/tests/unitinternal/HelloMain.java @@ -51,7 +51,6 @@ public class HelloMain { long id = 1; TOne data = eServer.find(TOne.class, id); if (data == null) { - System.out.println("This is the first run, saving data.."); TOne tone = new TOne(); tone.setName("banan"); eServer.save(tone);// new TOne()id, "Hello World!")); diff --git a/src/test/java/com/avaje/tests/unitinternal/TestSimpleEncryptor.java b/src/test/java/com/avaje/tests/unitinternal/TestSimpleEncryptor.java index 9f6d332b1..e60376df1 100644 --- a/src/test/java/com/avaje/tests/unitinternal/TestSimpleEncryptor.java +++ b/src/test/java/com/avaje/tests/unitinternal/TestSimpleEncryptor.java @@ -23,17 +23,11 @@ public class TestSimpleEncryptor extends BaseTestCase { byte[] data = "test123".getBytes(); byte[] ecData = e.encrypt(data, key); - System.out.println(Arrays.toString(ecData)); byte[] deData = e.decrypt(ecData, key); - String s = new String(deData); - - System.out.println(s); - Timestamp t = new Timestamp(System.currentTimeMillis()); byte[] ecTimestamp = e.encryptString(t.toString(), key); - System.out.println(t + " encrypted -> " + Arrays.toString(ecTimestamp)); String tsFormat = e.decryptString(ecTimestamp, key); Timestamp t1 = Timestamp.valueOf(tsFormat); diff --git a/src/test/java/com/avaje/tests/update/TestJsonStatelessUpdate.java b/src/test/java/com/avaje/tests/update/TestJsonStatelessUpdate.java index ba536e5bb..532bd93d1 100644 --- a/src/test/java/com/avaje/tests/update/TestJsonStatelessUpdate.java +++ b/src/test/java/com/avaje/tests/update/TestJsonStatelessUpdate.java @@ -35,7 +35,6 @@ public class TestJsonStatelessUpdate extends BaseTestCase { JsonWriteOptions writeOptions = JsonWriteOptions.parsePath("(id,name,master(*))"); String jsonString = jsonContext.toJson(twoX, writeOptions); - System.out.println(jsonString); jsonString = jsonString.replace("twoName", "twoNameModified"); jsonString = jsonString.replace("oneName", "oneNameModified");