From 24151f11fd6b82643a7ef8987f463c3cfbcbcb23 Mon Sep 17 00:00:00 2001 From: Robin Bygrave Date: Wed, 27 Jan 2016 20:12:36 +1300 Subject: [PATCH] #543 - Tidy up test logging - adjust test LoggedSqlCollector - remove logging noise when running tests --- .../com/avaje/ebean/PrimaryServerTest.java | 1 - .../MigrationXmlWriterTest.java | 6 ------ .../TestLazyLoadEmptyCollection.java | 2 -- .../avaje/tests/changelog/TestChangeLog.java | 3 --- .../tests/query/TestQueryFindIterate.java | 5 ++++- .../tests/query/TestQueryJoinMulipleMany.java | 1 - .../query/other/TestWhereLikeWithSlash.java | 6 ++---- .../text/json/TestJsonBeanWithTimeZone.java | 20 ++++++------------- 8 files changed, 12 insertions(+), 32 deletions(-) diff --git a/src/test/java/com/avaje/ebean/PrimaryServerTest.java b/src/test/java/com/avaje/ebean/PrimaryServerTest.java index 6e5038a11..f4a2ba425 100644 --- a/src/test/java/com/avaje/ebean/PrimaryServerTest.java +++ b/src/test/java/com/avaje/ebean/PrimaryServerTest.java @@ -30,7 +30,6 @@ public class PrimaryServerTest { public void testLoadProperties() throws Exception { Properties properties = PrimaryServer.getProperties(); - System.out.println(properties); assertTrue(properties.size() > 0); } } \ No newline at end of file diff --git a/src/test/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java b/src/test/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java index 3799057d6..b4be314de 100644 --- a/src/test/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java +++ b/src/test/java/com/avaje/ebean/dbmigration/migrationreader/MigrationXmlWriterTest.java @@ -2,15 +2,11 @@ package com.avaje.ebean.dbmigration.migrationreader; import com.avaje.ebean.dbmigration.migration.Migration; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.io.File; public class MigrationXmlWriterTest { - Logger logger = LoggerFactory.getLogger(MigrationXmlWriterTest.class); - @Test public void testReadWrite() throws Exception { @@ -20,7 +16,5 @@ public class MigrationXmlWriterTest { MigrationXmlWriter writer = new MigrationXmlWriter(); writer.write(migration, temp); - logger.info("wrote migration file: "+temp.getAbsolutePath()); - } } \ No newline at end of file diff --git a/src/test/java/com/avaje/tests/batchload/TestLazyLoadEmptyCollection.java b/src/test/java/com/avaje/tests/batchload/TestLazyLoadEmptyCollection.java index b586dc422..9e72be21a 100644 --- a/src/test/java/com/avaje/tests/batchload/TestLazyLoadEmptyCollection.java +++ b/src/test/java/com/avaje/tests/batchload/TestLazyLoadEmptyCollection.java @@ -34,8 +34,6 @@ public class TestLazyLoadEmptyCollection extends BaseTestCase { for (Contact contact : contacts) { contact.getNotes(); } - System.out.println(customer); - System.out.println(contacts); } } diff --git a/src/test/java/com/avaje/tests/changelog/TestChangeLog.java b/src/test/java/com/avaje/tests/changelog/TestChangeLog.java index 5436117af..885a07bc7 100644 --- a/src/test/java/com/avaje/tests/changelog/TestChangeLog.java +++ b/src/test/java/com/avaje/tests/changelog/TestChangeLog.java @@ -102,9 +102,6 @@ public class TestChangeLog extends BaseTestCase { this.changes = changes; try { String json = objectMapper.writeValueAsString(changes); - - logger.info(json); - ChangeSet changes1 = objectMapper.readValue(json, ChangeSet.class); assertEquals(changes.getTxnId(), changes1.getTxnId()); diff --git a/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java b/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java index 0d0667d8c..b4ce33d75 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java +++ b/src/test/java/com/avaje/tests/query/TestQueryFindIterate.java @@ -61,7 +61,10 @@ public class TestQueryFindIterate extends BaseTestCase { Order order = queryIterator.next(); Customer customer = order.getCustomer(); // invoke lazy loading on customer, order details and order shipments - 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/TestQueryJoinMulipleMany.java b/src/test/java/com/avaje/tests/query/TestQueryJoinMulipleMany.java index 7e4bb7032..55e0eef9f 100644 --- a/src/test/java/com/avaje/tests/query/TestQueryJoinMulipleMany.java +++ b/src/test/java/com/avaje/tests/query/TestQueryJoinMulipleMany.java @@ -22,7 +22,6 @@ public class TestQueryJoinMulipleMany extends BaseTestCase { .gt("id", 0).findList(); Assert.assertNotNull(list); - System.out.println(list); for (Order order : list) { List contacts = order.getCustomer().getContacts(); diff --git a/src/test/java/com/avaje/tests/query/other/TestWhereLikeWithSlash.java b/src/test/java/com/avaje/tests/query/other/TestWhereLikeWithSlash.java index 68937c9b0..285053af8 100644 --- a/src/test/java/com/avaje/tests/query/other/TestWhereLikeWithSlash.java +++ b/src/test/java/com/avaje/tests/query/other/TestWhereLikeWithSlash.java @@ -17,11 +17,9 @@ public class TestWhereLikeWithSlash extends BaseTestCase { basic.setName("slash\\monkey"); Ebean.save(basic); - - + Query query = Ebean.find(EBasic.class).where().like("name", "slash\\mon%").query(); - - List list = query.findList(); + query.findList(); // This doesn't work in the latest version of H2 so disable for now. // Still good on Postgres which was the original issue diff --git a/src/test/java/com/avaje/tests/text/json/TestJsonBeanWithTimeZone.java b/src/test/java/com/avaje/tests/text/json/TestJsonBeanWithTimeZone.java index 73d0e79a2..19d8f5167 100644 --- a/src/test/java/com/avaje/tests/text/json/TestJsonBeanWithTimeZone.java +++ b/src/test/java/com/avaje/tests/text/json/TestJsonBeanWithTimeZone.java @@ -1,27 +1,23 @@ package com.avaje.tests.text.json; -import java.io.IOException; -import java.util.TimeZone; - -import org.junit.Assert; -import org.junit.Test; - import com.avaje.ebean.BaseTestCase; import com.avaje.ebean.Ebean; import com.avaje.ebean.text.json.JsonContext; import com.avaje.tests.model.basic.BeanWithTimeZone; +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; +import java.util.TimeZone; public class TestJsonBeanWithTimeZone extends BaseTestCase { - //private static final Logger logger = LoggerFactory.getLogger(TestJsonBeanWithTimeZone.class); - @Test public void testSimple() throws IOException { TimeZone defaultTimeZone = TimeZone.getDefault(); - String[] ids = TimeZone.getAvailableIDs(defaultTimeZone.getRawOffset()); - System.out.println(ids); + TimeZone.getAvailableIDs(defaultTimeZone.getRawOffset()); String id = defaultTimeZone.getID(); TimeZone timeZone = TimeZone.getTimeZone(id); @@ -43,10 +39,6 @@ public class TestJsonBeanWithTimeZone extends BaseTestCase { Assert.assertEquals(bean.getTimezone(), bean3.getTimezone()); - // EbeanServer server = Ebean.getServer(null); - // server.shutdown(); - // logger.info("shudown server manually, JVM shutdown hook fires next"); - } }