You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by dk...@apache.org on 2011/09/15 16:39:40 UTC
svn commit: r1171115 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne:
access/jdbc/ access/trans/ dba/oracle/
Author: dkazimirchyk
Date: Thu Sep 15 14:39:40 2011
New Revision: 1171115
URL: http://svn.apache.org/viewvc?rev=1171115&view=rev
Log:
CAY-1619 AdhocObjectFactory: passing factory.newInstance() as parameter causes compilation error
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SoftDeleteBatchQueryBuilderTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/DeleteBatchQueryBuilderTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/InsertBatchQueryBuilderTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/UpdateBatchQueryBuilderTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SoftDeleteBatchQueryBuilderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SoftDeleteBatchQueryBuilderTest.java?rev=1171115&r1=1171114&r2=1171115&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SoftDeleteBatchQueryBuilderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/jdbc/SoftDeleteBatchQueryBuilderTest.java Thu Sep 15 14:39:40 2011
@@ -54,8 +54,10 @@ public class SoftDeleteBatchQueryBuilder
private AdhocObjectFactory objectFactory;
private DeleteBatchQueryBuilder createBuilder() {
- return createBuilder(
- objectFactory.newInstance(JdbcAdapter.class, JdbcAdapter.class.getName()));
+ JdbcAdapter adapter = objectFactory.newInstance(
+ JdbcAdapter.class,
+ JdbcAdapter.class.getName());
+ return createBuilder(adapter);
}
private DeleteBatchQueryBuilder createBuilder(JdbcAdapter adapter) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/DeleteBatchQueryBuilderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/DeleteBatchQueryBuilderTest.java?rev=1171115&r1=1171114&r2=1171115&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/DeleteBatchQueryBuilderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/DeleteBatchQueryBuilderTest.java Thu Sep 15 14:39:40 2011
@@ -66,8 +66,9 @@ public class DeleteBatchQueryBuilderTest
.getAttribute("LOCKING_TEST_ID"));
DeleteBatchQuery deleteQuery = new DeleteBatchQuery(entity, idAttributes, null, 1);
- DeleteBatchQueryBuilder builder = new DeleteBatchQueryBuilder(
- objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName()));
+
+ DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
+ DeleteBatchQueryBuilder builder = new DeleteBatchQueryBuilder(adapter);
String generatedSql = builder.createSqlString(deleteQuery);
assertNotNull(generatedSql);
assertEquals(
@@ -90,8 +91,9 @@ public class DeleteBatchQueryBuilderTest
idAttributes,
nullAttributes,
1);
- DeleteBatchQueryBuilder builder = new DeleteBatchQueryBuilder(
- objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName()));
+
+ DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
+ DeleteBatchQueryBuilder builder = new DeleteBatchQueryBuilder(adapter);
String generatedSql = builder.createSqlString(deleteQuery);
assertNotNull(generatedSql);
assertEquals("DELETE FROM "
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/InsertBatchQueryBuilderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/InsertBatchQueryBuilderTest.java?rev=1171115&r1=1171114&r2=1171115&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/InsertBatchQueryBuilderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/InsertBatchQueryBuilderTest.java Thu Sep 15 14:39:40 2011
@@ -55,9 +55,9 @@ public class InsertBatchQueryBuilderTest
DbEntity entity = runtime.getDataDomain().getEntityResolver().lookupObjEntity(
SimpleLockingTestEntity.class).getDbEntity();
+ DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
InsertBatchQuery deleteQuery = new InsertBatchQuery(entity, 1);
- InsertBatchQueryBuilder builder = new InsertBatchQueryBuilder(
- objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName()));
+ InsertBatchQueryBuilder builder = new InsertBatchQueryBuilder(adapter);
String generatedSql = builder.createSqlString(deleteQuery);
assertNotNull(generatedSql);
assertEquals("INSERT INTO "
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/UpdateBatchQueryBuilderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/UpdateBatchQueryBuilderTest.java?rev=1171115&r1=1171114&r2=1171115&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/UpdateBatchQueryBuilderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/trans/UpdateBatchQueryBuilderTest.java Thu Sep 15 14:39:40 2011
@@ -70,8 +70,9 @@ public class UpdateBatchQueryBuilderTest
updatedAttributes,
null,
1);
- UpdateBatchQueryBuilder builder = new UpdateBatchQueryBuilder(
- objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName()));
+
+ DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
+ UpdateBatchQueryBuilder builder = new UpdateBatchQueryBuilder(adapter);
String generatedSql = builder.createSqlString(updateQuery);
assertNotNull(generatedSql);
assertEquals("UPDATE "
@@ -97,8 +98,9 @@ public class UpdateBatchQueryBuilderTest
updatedAttributes,
nullAttributes,
1);
- UpdateBatchQueryBuilder builder = new UpdateBatchQueryBuilder(
- objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName()));
+
+ DbAdapter adapter = objectFactory.newInstance(DbAdapter.class, JdbcAdapter.class.getName());
+ UpdateBatchQueryBuilder builder = new UpdateBatchQueryBuilder(adapter);
String generatedSql = builder.createSqlString(updateQuery);
assertNotNull(generatedSql);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorTest.java?rev=1171115&r1=1171114&r2=1171115&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/oracle/OraclePkGeneratorTest.java Thu Sep 15 14:39:40 2011
@@ -40,8 +40,8 @@ public class OraclePkGeneratorTest exten
@Override
protected void setUpAfterInjection() throws Exception {
- pkGenerator = new OraclePkGenerator(
- objectFactory.newInstance(OracleAdapter.class, OracleAdapter.class.getName()));
+ OracleAdapter adapter = objectFactory.newInstance(OracleAdapter.class, OracleAdapter.class.getName());
+ pkGenerator = new OraclePkGenerator(adapter);
}
public void testSequenceNameDefault() throws Exception {