[258541] JPA 2.0 default delimited identifiers - model

1 files changed, 15 insertions, 15 deletions

diff --git a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/PostgreSQLTests.java b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/PostgreSQLTests.java
index 73feea8609..4b54bbf4fb 100644
--- a/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/PostgreSQLTests.java
+++ b/jpa/tests/org.eclipse.jpt.db.tests/src/org/eclipse/jpt/db/tests/internal/platforms/PostgreSQLTests.java
@@ -220,9 +220,9 @@ public class PostgreSQLTests extends DTPPlatformTests {
 
 		// FOO
 		Table fooTable = schema.getTableForIdentifier("FOO");
-		assertEquals(3, fooTable.columnsSize());
-		assertEquals(1, fooTable.primaryKeyColumnsSize());
-		assertEquals(1, fooTable.foreignKeysSize());
+		assertEquals(3, fooTable.getColumnsSize());
+		assertEquals(1, fooTable.getPrimaryKeyColumnsSize());
+		assertEquals(1, fooTable.getForeignKeysSize());
 
 		Column pkColumn = fooTable.getPrimaryKeyColumn();
 		assertEquals("id", pkColumn.getName());
@@ -244,8 +244,8 @@ public class PostgreSQLTests extends DTPPlatformTests {
 		assertTrue(barColumn.isPartOfForeignKey());
 		assertFalse(barColumn.isPartOfPrimaryKey());
 
-		ForeignKey barFK = fooTable.foreignKeys().next();  // there should only be 1 foreign key
-		assertEquals(1, barFK.columnPairsSize());
+		ForeignKey barFK = fooTable.getForeignKeys().iterator().next();  // there should only be 1 foreign key
+		assertEquals(1, barFK.getColumnPairsSize());
 		assertEquals("bar", barFK.getAttributeName());
 		assertNull(barFK.getJoinColumnAnnotationIdentifier("bar"));
 		assertEquals("bar_id", barFK.getJoinColumnAnnotationIdentifier("primaryBar"));
@@ -256,9 +256,9 @@ public class PostgreSQLTests extends DTPPlatformTests {
 
 		// BAR
 		Table barTable = schema.getTableForIdentifier("BAR");
-		assertEquals(2, barTable.columnsSize());
-		assertEquals(1, barTable.primaryKeyColumnsSize());
-		assertEquals(0, barTable.foreignKeysSize());
+		assertEquals(2, barTable.getColumnsSize());
+		assertEquals(1, barTable.getPrimaryKeyColumnsSize());
+		assertEquals(0, barTable.getForeignKeysSize());
 		assertEquals("id", barTable.getPrimaryKeyColumn().getName());
 		assertFalse(barTable.isPossibleJoinTable());
 		assertEquals("BYTEA", barTable.getColumnForIdentifier("CHUNK").getDataTypeName());
@@ -268,9 +268,9 @@ public class PostgreSQLTests extends DTPPlatformTests {
 
 		// FOO_BAZ
 		Table foo_bazTable = schema.getTableForIdentifier("FOO_BAZ");
-		assertEquals(2, foo_bazTable.columnsSize());
-		assertEquals(0, foo_bazTable.primaryKeyColumnsSize());
-		assertEquals(2, foo_bazTable.foreignKeysSize());
+		assertEquals(2, foo_bazTable.getColumnsSize());
+		assertEquals(0, foo_bazTable.getPrimaryKeyColumnsSize());
+		assertEquals(2, foo_bazTable.getForeignKeysSize());
 		assertTrue(foo_bazTable.isPossibleJoinTable());
 		assertTrue(foo_bazTable.joinTableNameIsDefault());
 		assertTrue(foo_bazTable.getColumnForIdentifier("FOO_ID").isPartOfForeignKey());
@@ -409,13 +409,13 @@ public class PostgreSQLTests extends DTPPlatformTests {
 		assertNotNull(schema2);
 		Table empTable = schema2.getTableNamed("emp");
 		assertNotNull(empTable);
-		assertEquals(1, empTable.foreignKeysSize());
-		ForeignKey fk = empTable.foreignKeys().next();
+		assertEquals(1, empTable.getForeignKeysSize());
+		ForeignKey fk = empTable.getForeignKeys().iterator().next();
 		Table refTable = fk.getReferencedTable();
 		assertNotNull(refTable);
 		assertEquals("org", refTable.getName());
-		assertEquals(1, fk.columnPairsSize());
-		ForeignKey.ColumnPair cp = fk.columnPairs().next();
+		assertEquals(1, fk.getColumnPairsSize());
+		ForeignKey.ColumnPair cp = fk.getColumnPairs().iterator().next();
 		Column baseColumn = cp.getBaseColumn();
 		assertEquals("org_id", baseColumn.getName());
 		Column refColumn = cp.getReferencedColumn();