Return-Path: X-Original-To: apmail-db-torque-dev-archive@www.apache.org Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F3F9BCE34 for ; Thu, 19 Apr 2012 11:57:46 +0000 (UTC) Received: (qmail 55038 invoked by uid 500); 19 Apr 2012 11:57:46 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 55018 invoked by uid 500); 19 Apr 2012 11:57:46 -0000 Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Apache Torque Developers List" Reply-To: "Apache Torque Developers List" Delivered-To: mailing list torque-dev@db.apache.org Received: (qmail 55010 invoked by uid 500); 19 Apr 2012 11:57:46 -0000 Received: (qmail 55007 invoked by uid 99); 19 Apr 2012 11:57:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Apr 2012 11:57:46 +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; Thu, 19 Apr 2012 11:57:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 093692388962; Thu, 19 Apr 2012 11:57:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1327909 - in /db/torque/torque4/trunk/torque-test/src: main/schema/default-value-schema.xml test/java/org/apache/torque/generated/peer/UseDefaultValueFromDatabaseTest.java Date: Thu, 19 Apr 2012 11:57:20 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120419115721.093692388962@eris.apache.org> Author: tfischer Date: Thu Apr 19 11:57:20 2012 New Revision: 1327909 URL: http://svn.apache.org/viewvc?rev=1327909&view=rev Log: TORQUE-15 test allowing database default values for columns Added: db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/UseDefaultValueFromDatabaseTest.java Added: db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml?rev=1327909&view=auto ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml (added) +++ db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml Thu Apr 19 11:57:20 2012 @@ -0,0 +1,67 @@ + + + + + + + + + + + +
+ Added: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/UseDefaultValueFromDatabaseTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/UseDefaultValueFromDatabaseTest.java?rev=1327909&view=auto ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/UseDefaultValueFromDatabaseTest.java (added) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/UseDefaultValueFromDatabaseTest.java Thu Apr 19 11:57:20 2012 @@ -0,0 +1,148 @@ +package org.apache.torque.generated.peer; + +import java.sql.Types; + +import org.apache.torque.BaseDatabaseTestCase; +import org.apache.torque.test.DefaultValues; +import org.apache.torque.test.DefaultValuesPeer; +import org.apache.torque.util.ColumnValues; +import org.apache.torque.util.JdbcTypedValue; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * Tests whether the useDatabaseDefaultValue attribute works. + * It is difficult to have database default values for the different + * databases, so the test checks the results of the buildColumnValues + * method of the peers. + * + * @version $Id: DataTest.java 1213056 2011-12-11 20:31:06Z tfischer $ + */ +public class UseDefaultValueFromDatabaseTest extends BaseDatabaseTestCase +{ + /** + * Tests whether the buildColumnValues adds column values + * for columns which have no database default on a new object. + */ + public void testJavaDefaultValueOnNewObject() throws Exception + { + DefaultValues defaultValues = new DefaultValues(); + ColumnValues columnValues + = DefaultValuesPeer.buildColumnValues(defaultValues); + assertEquals( + new JdbcTypedValue(3, Types.INTEGER), + columnValues.get(DefaultValuesPeer.O_INTEGER_WITH_DEFAULT)); + assertEquals( + new JdbcTypedValue(5, Types.INTEGER), + columnValues.get(DefaultValuesPeer.P_INT_WITH_DEFAULT)); + } + + /** + * Tests whether the buildColumnValues does not add column values + * for columns which use the database default value on a new object. + */ + public void testDatabaseDefaultValueOnNewObject() throws Exception + { + DefaultValues defaultValues = new DefaultValues(); + ColumnValues columnValues + = DefaultValuesPeer.buildColumnValues(defaultValues); + assertNull( + columnValues.get(DefaultValuesPeer.O_INTEGER_DEFAULT_FROM_DB)); + assertNull( + columnValues.get(DefaultValuesPeer.P_INT_DEFAULT_FROM_DB)); + } + + /** + * Tests whether the buildColumnValues adds column values + * for columns with modified value which have no database default + * on a new object. + */ + public void testJavaDefaultValueOnNewObjectChangedValue() throws Exception + { + DefaultValues defaultValues = new DefaultValues(); + defaultValues.setOIntegerWithDefault(6); + defaultValues.setPIntWithDefault(7); + ColumnValues columnValues + = DefaultValuesPeer.buildColumnValues(defaultValues); + assertEquals( + new JdbcTypedValue(6, Types.INTEGER), + columnValues.get(DefaultValuesPeer.O_INTEGER_WITH_DEFAULT)); + assertEquals( + new JdbcTypedValue(7, Types.INTEGER), + columnValues.get(DefaultValuesPeer.P_INT_WITH_DEFAULT)); + } + + /** + * Tests whether the buildColumnValues adds column values + * for columns with modified value + * which use the database default value on a new object. + */ + public void testDatabaseDefaultValueOnNewObjectChangedValue() + throws Exception + { + DefaultValues defaultValues = new DefaultValues(); + defaultValues.setOIntegerDefaultFromDb(6); + defaultValues.setPIntDefaultFromDb(7); + ColumnValues columnValues + = DefaultValuesPeer.buildColumnValues(defaultValues); + assertEquals( + new JdbcTypedValue(6, Types.INTEGER), + columnValues.get(DefaultValuesPeer.O_INTEGER_DEFAULT_FROM_DB)); + assertEquals( + new JdbcTypedValue(7, Types.INTEGER), + columnValues.get(DefaultValuesPeer.P_INT_DEFAULT_FROM_DB)); + } + + /** + * Tests whether the buildColumnValues adds column values + * for columns which have no database default on a not new object. + */ + public void testJavaDefaultValueOnNotNewObject() throws Exception + { + DefaultValues defaultValues = new DefaultValues(); + defaultValues.setNew(false); + ColumnValues columnValues + = DefaultValuesPeer.buildColumnValues(defaultValues); + assertEquals( + new JdbcTypedValue(3, Types.INTEGER), + columnValues.get(DefaultValuesPeer.O_INTEGER_WITH_DEFAULT)); + assertEquals( + new JdbcTypedValue(5, Types.INTEGER), + columnValues.get(DefaultValuesPeer.P_INT_WITH_DEFAULT)); + } + + /** + * Tests whether the buildColumnValues adds column values + * for columns which use the database default value on a not new object. + */ + public void testDatabaseDefaultValueOnNotNewObject() throws Exception + { + DefaultValues defaultValues = new DefaultValues(); + defaultValues.setNew(false); + ColumnValues columnValues + = DefaultValuesPeer.buildColumnValues(defaultValues); + assertEquals( + new JdbcTypedValue(2, Types.INTEGER), + columnValues.get(DefaultValuesPeer.O_INTEGER_DEFAULT_FROM_DB)); + assertEquals( + new JdbcTypedValue(4, Types.INTEGER), + columnValues.get(DefaultValuesPeer.P_INT_DEFAULT_FROM_DB)); + } +} --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org