Return-Path: X-Original-To: apmail-cayenne-commits-archive@www.apache.org Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 52A7310421 for ; Fri, 7 Feb 2014 13:16:48 +0000 (UTC) Received: (qmail 34724 invoked by uid 500); 7 Feb 2014 13:16:45 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 33852 invoked by uid 500); 7 Feb 2014 13:16:38 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 33841 invoked by uid 99); 7 Feb 2014 13:16:36 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Feb 2014 13:16:36 +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; Fri, 07 Feb 2014 13:16:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7D637238889B; Fri, 7 Feb 2014 13:16:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1565638 - in /cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server: ServerCaseDataDomainProvider.java ServerRuntimeProvider.java Date: Fri, 07 Feb 2014 13:16:12 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140207131612.7D637238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aadamchik Date: Fri Feb 7 13:16:12 2014 New Revision: 1565638 URL: http://svn.apache.org/r1565638 Log: fixing stored procedures bootstrap in unt tests Modified: cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataDomainProvider.java cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerRuntimeProvider.java Modified: cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataDomainProvider.java URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataDomainProvider.java?rev=1565638&r1=1565637&r2=1565638&view=diff ============================================================================== --- cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataDomainProvider.java (original) +++ cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataDomainProvider.java Fri Feb 7 13:16:12 2014 @@ -27,6 +27,8 @@ import org.apache.cayenne.dba.DbAdapter; import org.apache.cayenne.di.Inject; import org.apache.cayenne.log.JdbcEventLogger; import org.apache.cayenne.map.DataMap; +import org.apache.cayenne.map.Procedure; +import org.apache.cayenne.unit.UnitDbAdapter; class ServerCaseDataDomainProvider extends DataDomainProvider { @@ -35,9 +37,12 @@ class ServerCaseDataDomainProvider exten @Inject private DbAdapter adapter; - + @Inject private JdbcEventLogger jdbcEventLogger; + + @Inject + private UnitDbAdapter unitDbAdapter; @Override protected DataDomain createDataDomain(String name) { @@ -49,9 +54,10 @@ class ServerCaseDataDomainProvider exten DataDomain domain = super.createAndInitDataDomain(); - // add nodes and DataSources dynamically... + for (DataMap dataMap : domain.getDataMaps()) { + // add nodes and DataSources dynamically... DataNode node = new DataNode(dataMap.getName()); node.setJdbcEventLogger(jdbcEventLogger); @@ -61,7 +67,13 @@ class ServerCaseDataDomainProvider exten node.addDataMap(dataMap); node.setSchemaUpdateStrategy(new SkipSchemaUpdateStrategy()); - // customizations from SimpleAccessStackAdapter that are not yet ported... + // tweak procedures for testing... + for (Procedure proc : dataMap.getProcedures()) { + unitDbAdapter.tweakProcedure(proc); + } + + // customizations from SimpleAccessStackAdapter that are not yet + // ported... // those can be done better now // node @@ -69,10 +81,6 @@ class ServerCaseDataDomainProvider exten // .getExtendedTypes() // .registerType(new StringET1ExtendedType()); // - // // tweak mapping with a delegate - // for (Procedure proc : map.getProcedures()) { - // getAdapter(node).tweakProcedure(proc); - // } domain.addNode(node); } Modified: cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerRuntimeProvider.java URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerRuntimeProvider.java?rev=1565638&r1=1565637&r2=1565638&view=diff ============================================================================== --- cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerRuntimeProvider.java (original) +++ cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/di/server/ServerRuntimeProvider.java Fri Feb 7 13:16:12 2014 @@ -26,21 +26,25 @@ import org.apache.cayenne.di.Binder; import org.apache.cayenne.di.Inject; import org.apache.cayenne.di.Module; import org.apache.cayenne.di.Provider; +import org.apache.cayenne.unit.UnitDbAdapter; public class ServerRuntimeProvider implements Provider { private ServerCaseProperties properties; private ServerCaseDataSourceFactory dataSourceFactory; + private UnitDbAdapter unitDbAdapter; private Provider dbAdapterProvider; public ServerRuntimeProvider(@Inject ServerCaseDataSourceFactory dataSourceFactory, @Inject ServerCaseProperties properties, - @Inject Provider dbAdapterProvider) { + @Inject Provider dbAdapterProvider, + @Inject UnitDbAdapter unitDbAdapter) { this.dataSourceFactory = dataSourceFactory; this.properties = properties; this.dbAdapterProvider = dbAdapterProvider; + this.unitDbAdapter = unitDbAdapter; } public ServerRuntime get() throws ConfigurationException { @@ -63,6 +67,7 @@ public class ServerRuntimeProvider imple binder.bind(DbAdapter.class).toProviderInstance(dbAdapterProvider); binder.bind(DataDomain.class).toProvider(ServerCaseDataDomainProvider.class); + binder.bind(UnitDbAdapter.class).toInstance(unitDbAdapter); // map DataSources for all test DataNode names binder.bind(ServerCaseDataSourceFactory.class).toInstance(dataSourceFactory);