Re: svn commit: r689323 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/merge/DropColumnToModelTest.java

[Tore Halset]

Thanks and Sorry!

 - Tore.

On Aug 27, 2008, at 03:21, [EMAIL PROTECTED] wrote:

Author: kmenard
Date: Tue Aug 26 18:21:55 2008
New Revision: 689323

URL: http://svn.apache.org/viewvc?rev=689323&view=rev
Log:
Updated a test based on Tore's fix of a typo in the main code.

Modified:

cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/ java/org/apache/cayenne/merge/DropColumnToModelTest.java

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=689323&r1=689322&r2=689323&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 Tue Aug 26 18:21:55 2008

@@ -63,7 +63,7 @@
        map.addObjEntity(objEntity);

        // force drop name column in db

- MergerToken token = mergerFactory().createDropColumToDb(dbEntity, column2); + MergerToken token = mergerFactory().createDropColumnToDb(dbEntity, column2);

        execute(token);

        List<MergerToken> tokens = createMergeTokens();
@@ -128,7 +128,7 @@
        assertTokensAndExecute(node, map, 0, 0);

        // force drop fk column in db

- execute(mergerFactory().createDropColumToDb(dbEntity2, e2col2)); + execute(mergerFactory().createDropColumnToDb(dbEntity2, e2col2));

        // create db relationships, but do not sync them to db
        DbRelationship rel1To2 = new DbRelationship("rel1To2");