added tests for Multitenant.VPD and fixed an error in the java context model

2 files changed, 22 insertions, 0 deletions

diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_3JavaMultitenancyTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_3JavaMultitenancyTests.java
index 24c8908fd9..fc245a61e5 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_3JavaMultitenancyTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_3JavaMultitenancyTests.java
@@ -193,6 +193,11 @@ public class EclipseLink2_3JavaMultitenancyTests extends EclipseLink2_3ContextMo
 
 		assertEquals(EclipseLinkMultitenantType2_3.TABLE_PER_TENANT, getJavaMultitenancy().getSpecifiedType());
 
+		multitenant.setValue(MultitenantType2_3.VPD);
+		getJpaProject().synchronizeContextModel();
+
+		assertEquals(EclipseLinkMultitenantType2_3.VPD, getJavaMultitenancy().getSpecifiedType());
+
 		multitenant.setValue(null);
 		getJpaProject().synchronizeContextModel();
 
@@ -217,6 +222,11 @@ public class EclipseLink2_3JavaMultitenancyTests extends EclipseLink2_3ContextMo
 
 		assertEquals(EclipseLinkMultitenantType2_3.TABLE_PER_TENANT, getJavaMultitenancy().getSpecifiedType());		
 		assertEquals(MultitenantType2_3.TABLE_PER_TENANT, multitenant.getValue());
+
+		getJavaMultitenancy().setSpecifiedType(EclipseLinkMultitenantType2_3.VPD);
+
+		assertEquals(EclipseLinkMultitenantType2_3.VPD, getJavaMultitenancy().getSpecifiedType());		
+		assertEquals(MultitenantType2_3.VPD, multitenant.getValue());
 	}
 //
 //	public void testIsIncludeCriteria() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_3OrmMultitenancyTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_3OrmMultitenancyTests.java
index 63d91583eb..679f057e70 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_3OrmMultitenancyTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_3OrmMultitenancyTests.java
@@ -139,6 +139,10 @@ public class EclipseLink2_3OrmMultitenancyTests
 		assertEquals(EclipseLinkMultitenantType2_3.TABLE_PER_TENANT, ormMultitenancy.getSpecifiedType());
 		assertEquals(MultitenantType.TABLE_PER_TENANT, multitenantResource.getType());
 
+		multitenantResource.setType(MultitenantType.VPD);
+		assertEquals(EclipseLinkMultitenantType2_3.VPD, ormMultitenancy.getSpecifiedType());
+		assertEquals(MultitenantType.VPD, multitenantResource.getType());
+
 		multitenantHolder.setMultitenant(null);
 		assertNull(ormMultitenancy.getSpecifiedType());
 		assertNull(ormMultitenancy.getType());
@@ -160,6 +164,14 @@ public class EclipseLink2_3OrmMultitenancyTests
 		assertEquals(EclipseLinkMultitenantType2_3.SINGLE_TABLE, ormMultitenancy.getSpecifiedType());
 		assertEquals(MultitenantType.SINGLE_TABLE, multitenantResource.getType());
 
+		ormMultitenancy.setSpecifiedType(EclipseLinkMultitenantType2_3.VPD);
+		assertEquals(EclipseLinkMultitenantType2_3.VPD, ormMultitenancy.getSpecifiedType());
+		assertEquals(MultitenantType.VPD, multitenantResource.getType());
+
+		ormMultitenancy.setSpecifiedType(EclipseLinkMultitenantType2_3.TABLE_PER_TENANT);
+		assertEquals(EclipseLinkMultitenantType2_3.TABLE_PER_TENANT, ormMultitenancy.getSpecifiedType());
+		assertEquals(MultitenantType.TABLE_PER_TENANT, multitenantResource.getType());
+
 		//set type to null in the context model
 		ormMultitenancy.setSpecifiedType(null);
 		assertNull(ormMultitenancy.getSpecifiedType());