Author: aadamchik
Date: Sat Oct 20 23:41:00 2012
New Revision: 1400535
URL: http://svn.apache.org/viewvc?rev=1400535&view=rev
Log:
refactoring redundant test apis
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/AddColumnToModelTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/CreateTableToModelTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropColumnToModelTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropRelationshipToModelTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropTableToModelTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/SetPrimaryKeyToDbTest.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/AddColumnToModelTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/AddColumnToModelTest.java?rev=1400535&r1=1400534&r2=1400535&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/AddColumnToModelTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/AddColumnToModelTest.java
Sat Oct 20 23:41:00 2012
@@ -32,7 +32,7 @@ import org.apache.cayenne.unit.di.server
public class AddColumnToModelTest extends MergeCase {
public void testAddColumn() throws Exception {
- dropTableIfPresent(node, "NEW_TABLE");
+ dropTableIfPresent("NEW_TABLE");
assertTokensAndExecute(0, 0);
DbEntity dbEntity = new DbEntity("NEW_TABLE");
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/CreateTableToModelTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/CreateTableToModelTest.java?rev=1400535&r1=1400534&r2=1400535&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/CreateTableToModelTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/CreateTableToModelTest.java
Sat Oct 20 23:41:00 2012
@@ -31,7 +31,7 @@ import org.apache.cayenne.unit.di.server
public class CreateTableToModelTest extends MergeCase {
public void testAddTable() throws Exception {
- dropTableIfPresent(node, "NEW_TABLE");
+ dropTableIfPresent("NEW_TABLE");
assertTokensAndExecute(0, 0);
DbEntity dbEntity = new DbEntity("NEW_TABLE");
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropColumnToModelTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropColumnToModelTest.java?rev=1400535&r1=1400534&r2=1400535&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropColumnToModelTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropColumnToModelTest.java
Sat Oct 20 23:41:00 2012
@@ -35,7 +35,7 @@ import org.apache.cayenne.unit.di.server
public class DropColumnToModelTest extends MergeCase {
public void testSimpleColumn() throws Exception {
- dropTableIfPresent(node, "NEW_TABLE");
+ dropTableIfPresent("NEW_TABLE");
assertTokensAndExecute(0, 0);
@@ -92,8 +92,8 @@ public class DropColumnToModelTest exten
}
public void testRemoveFKColumnWithoutRelationshipInDb() throws Exception {
- dropTableIfPresent(node, "NEW_TABLE");
- dropTableIfPresent(node, "NEW_TABLE2");
+ dropTableIfPresent("NEW_TABLE");
+ dropTableIfPresent("NEW_TABLE2");
assertTokensAndExecute(0, 0);
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropRelationshipToModelTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropRelationshipToModelTest.java?rev=1400535&r1=1400534&r2=1400535&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropRelationshipToModelTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropRelationshipToModelTest.java
Sat Oct 20 23:41:00 2012
@@ -35,8 +35,8 @@ import org.apache.cayenne.unit.di.server
public class DropRelationshipToModelTest extends MergeCase {
public void testForreignKey() throws Exception {
- dropTableIfPresent(node, "NEW_TABLE");
- dropTableIfPresent(node, "NEW_TABLE2");
+ dropTableIfPresent("NEW_TABLE");
+ dropTableIfPresent("NEW_TABLE2");
assertTokensAndExecute(0, 0);
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropTableToModelTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropTableToModelTest.java?rev=1400535&r1=1400534&r2=1400535&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropTableToModelTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropTableToModelTest.java
Sat Oct 20 23:41:00 2012
@@ -32,7 +32,7 @@ import org.apache.cayenne.unit.di.server
public class DropTableToModelTest extends MergeCase {
public void testDropTable() throws Exception {
- dropTableIfPresent(node, "NEW_TABLE");
+ dropTableIfPresent("NEW_TABLE");
assertTokensAndExecute(0, 0);
DbEntity dbEntity = new DbEntity("NEW_TABLE");
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java?rev=1400535&r1=1400534&r2=1400535&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergeCase.java
Sat Oct 20 23:41:00 2012
@@ -197,8 +197,7 @@ public abstract class MergeCase extends
return node.getAdapter().mergerFactory();
}
- protected void dropTableIfPresent(DataNode node, String tableName)
- throws Exception {
+ protected void dropTableIfPresent(String tableName) throws Exception {
// must have a dummy datamap for the dummy table for the downstream
code
// to work
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTest.java?rev=1400535&r1=1400534&r2=1400535&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/MergerFactoryTest.java
Sat Oct 20 23:41:00 2012
@@ -125,7 +125,7 @@ public class MergerFactoryTest extends M
}
public void testAddTableToDb() throws Exception {
- dropTableIfPresent(node, "NEW_TABLE");
+ dropTableIfPresent("NEW_TABLE");
assertTokensAndExecute(0, 0);
@@ -174,7 +174,7 @@ public class MergerFactoryTest extends M
}
public void testAddForeignKeyWithTable() throws Exception {
- dropTableIfPresent(node, "NEW_TABLE");
+ dropTableIfPresent("NEW_TABLE");
assertTokensAndExecute(0, 0);
@@ -238,7 +238,7 @@ public class MergerFactoryTest extends M
}
public void testAddForeignKeyAfterTable() throws Exception {
- dropTableIfPresent(node, "NEW_TABLE");
+ dropTableIfPresent("NEW_TABLE");
assertTokensAndExecute(0, 0);
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/SetPrimaryKeyToDbTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/SetPrimaryKeyToDbTest.java?rev=1400535&r1=1400534&r2=1400535&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/SetPrimaryKeyToDbTest.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/SetPrimaryKeyToDbTest.java
Sat Oct 20 23:41:00 2012
@@ -29,7 +29,7 @@ import org.apache.cayenne.unit.di.server
public class SetPrimaryKeyToDbTest extends MergeCase {
public void test() throws Exception {
- dropTableIfPresent(node, "NEW_TABLE");
+ dropTableIfPresent("NEW_TABLE");
assertTokensAndExecute(0, 0);
DbEntity dbEntity1 = new DbEntity("NEW_TABLE");
