Return-Path: X-Original-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6FA286F5A for ; Wed, 13 Jul 2011 18:46:22 +0000 (UTC) Received: (qmail 40785 invoked by uid 500); 13 Jul 2011 18:46:22 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 40768 invoked by uid 500); 13 Jul 2011 18:46:22 -0000 Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: isis-dev@incubator.apache.org Delivered-To: mailing list isis-commits@incubator.apache.org Received: (qmail 40761 invoked by uid 99); 13 Jul 2011 18:46:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jul 2011 18:46:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jul 2011 18:46:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CAFFA238885D; Wed, 13 Jul 2011 18:46:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1146220 - /incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommon.java Date: Wed, 13 Jul 2011 18:46:00 -0000 To: isis-commits@incubator.apache.org From: kevin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110713184600.CAFFA238885D@eris.apache.org> Author: kevin Date: Wed Jul 13 18:46:00 2011 New Revision: 1146220 URL: http://svn.apache.org/viewvc?rev=1146220&view=rev Log: Turning on SQL log messages again - these tests were fixed! Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommon.java Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommon.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommon.java?rev=1146220&r1=1146219&r2=1146220&view=diff ============================================================================== --- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommon.java (original) +++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/tests-common/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/common/SqlIntegrationTestCommon.java Wed Jul 13 18:46:00 2011 @@ -33,6 +33,10 @@ import java.util.Properties; import junit.framework.TestCase; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; +import org.junit.Test; + import org.apache.isis.applib.value.Color; import org.apache.isis.applib.value.Date; import org.apache.isis.applib.value.DateTime; @@ -49,9 +53,6 @@ import org.apache.isis.runtimes.dflt.obj import org.apache.isis.runtimes.dflt.objectstores.sql.testsystem.dataclasses.SimpleClass; import org.apache.isis.runtimes.dflt.objectstores.sql.testsystem.dataclasses.SimpleClassTwo; import org.apache.isis.runtimes.dflt.objectstores.sql.testsystem.dataclasses.SqlDataClass; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.junit.Test; /** * @author Kevin kevin@kmz.co.za @@ -359,16 +360,15 @@ public abstract class SqlIntegrationTest public void testApplibDate() { final SqlDataClass sqlDataClass = SqlIntegrationTestSingleton.getDataClass(); - // LOG.log(Level.INFO, "Test: testDate() '2010-3-5' = 1267747200000"); + LOG.log(Level.INFO, "Test: testDate() '2010-3-5' = 1267747200000"); // 2010-3-5 = 1267747200000 - // LOG.log(Level.INFO, "applibDate.dateValue() as String: " + applibDate); - // LOG.log(Level.INFO, "applibDate.dateValue() as Long: " + applibDate.getMillisSinceEpoch()); + LOG.log(Level.INFO, "applibDate.dateValue() as String: " + applibDate); + LOG.log(Level.INFO, "applibDate.dateValue() as Long: " + applibDate.getMillisSinceEpoch()); // 2010-3-5 = 1267747200000 - // LOG.log(Level.INFO, "sqlDataClass.getDate() as String: " + sqlDataClass.getDate()); - // LOG.log(Level.INFO, "sqlDataClass.getDate().getTime() as Long: " + - // sqlDataClass.getDate().getMillisSinceEpoch()); + LOG.log(Level.INFO, "sqlDataClass.getDate() as String: " + sqlDataClass.getDate()); + LOG.log(Level.INFO, "sqlDataClass.getDate().getTime() as Long: " + sqlDataClass.getDate().getMillisSinceEpoch()); if (!applibDate.isEqualTo(sqlDataClass.getDate())) { fail("Applib date: Test '2010-3-5', expected " + applibDate.toString() + ", but got " @@ -391,16 +391,16 @@ public abstract class SqlIntegrationTest public void testSqlDate() { final SqlDataClass sqlDataClass = SqlIntegrationTestSingleton.getDataClass(); - // LOG.log(Level.INFO, "Test: testSqlDate() '2011-4-8' == 1302220800000"); + LOG.log(Level.INFO, "Test: testSqlDate() '2011-4-8' == 1302220800000"); // 2011-4-8 = 1302220800000 - // LOG.log(Level.INFO, "sqlDate.toString() as String:" + sqlDate); // shows as 2011-04-07 - // LOG.log(Level.INFO, "sqlDate.getTime() as Long:" + sqlDate.getTime()); + LOG.log(Level.INFO, "sqlDate.toString() as String:" + sqlDate); // shows as 2011-04-07 + LOG.log(Level.INFO, "sqlDate.getTime() as Long:" + sqlDate.getTime()); // 2011-4-8 = 1302220800000 - // LOG.log(Level.INFO, "sqlDataClass.getSqlDate() as String:" + sqlDataClass.getSqlDate()); // shows as + LOG.log(Level.INFO, "sqlDataClass.getSqlDate() as String:" + sqlDataClass.getSqlDate()); // shows as // 2011-04-07 - // LOG.log(Level.INFO, "sqlDataClass.getSqlDate().getTime() as Long:" + sqlDataClass.getSqlDate().getTime()); + LOG.log(Level.INFO, "sqlDataClass.getSqlDate().getTime() as Long:" + sqlDataClass.getSqlDate().getTime()); if (sqlDate.compareTo(sqlDataClass.getSqlDate()) != 0) { fail("SQL date: Test '2011-4-8', expected " + sqlDate.toString() + ", but got "