diff options
Diffstat (limited to 'jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink')
4 files changed, 80 insertions, 52 deletions
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java index ce5f19da34..c68d113fe9 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -52,11 +52,14 @@ import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; +import org.eclipse.jpt.jpa.core.resource.orm.XmlConvertibleMapping; import org.eclipse.jpt.jpa.core.resource.orm.XmlElementCollection; import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlElementCollection_2_0; +import org.eclipse.jpt.jpa.core.resource.orm.v2_1.XmlConvertibleMapping_2_1; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkElementCollectionMapping2_0; -import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvertibleMapping; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvert; import org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context.EclipseLink2_0ContextModelTestCase; @SuppressWarnings("nls") @@ -1623,16 +1626,19 @@ public class EclipseLink2_0OrmElementCollectionMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); - XmlConvertibleMapping elementCollectionResource = (XmlConvertibleMapping) getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); + XmlConvertibleMapping_2_1 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); + XmlConvert xmlConvert = (XmlConvert) elementCollectionResource.getConvert(); JavaElementCollectionMapping2_0 javaElementCollectionMapping = (JavaElementCollectionMapping2_0) ormPersistentType.getJavaPersistentType().getAttributeNamed("address").getMapping(); assertNull(ormElementCollectionMapping.getConverter().getType()); - assertEquals(null, elementCollectionResource.getConvert()); + assertEquals(null, xmlConvert); //set lob in the resource model, verify context model updated - elementCollectionResource.setConvert("myConvert"); + xmlConvert = EclipseLinkOrmFactory.eINSTANCE.createXmlConvert(); + xmlConvert.setConvert("myConvert"); + elementCollectionResource.setConvert(xmlConvert); assertEquals(EclipseLinkConvert.class, ormElementCollectionMapping.getConverter().getType()); - assertEquals("myConvert", elementCollectionResource.getConvert()); + assertEquals("myConvert", ((EclipseLinkConvert) ormElementCollectionMapping.getConverter()).getConverterName()); //set lob to null in the resource model elementCollectionResource.setConvert(null); @@ -1675,18 +1681,19 @@ public class EclipseLink2_0OrmElementCollectionMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); - XmlConvertibleMapping elementCollectionResource = (XmlConvertibleMapping) getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); - + XmlConvertibleMapping elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); + XmlConvert xmlConvert = (XmlConvert) elementCollectionResource.getConvert(); assertNull(ormElementCollectionMapping.getConverter().getType()); - assertEquals(null, elementCollectionResource.getConvert()); + assertEquals(null, xmlConvert); //set lob in the context model, verify resource model updated ormElementCollectionMapping.setConverter(EclipseLinkConvert.class); - assertEquals("none", elementCollectionResource.getConvert()); + xmlConvert = (XmlConvert) elementCollectionResource.getConvert(); + assertEquals("none", xmlConvert.getConvert()); assertEquals(EclipseLinkConvert.class, ormElementCollectionMapping.getConverter().getType()); ((EclipseLinkConvert) ormElementCollectionMapping.getConverter()).setSpecifiedConverterName("bar"); - assertEquals("bar", elementCollectionResource.getConvert()); + assertEquals("bar", xmlConvert.getConvert()); assertEquals(EclipseLinkConvert.class, ormElementCollectionMapping.getConverter().getType()); assertEquals("bar", ((EclipseLinkConvert) ormElementCollectionMapping.getConverter()).getSpecifiedConverterName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java index a256306fe2..fdb288d411 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2012 Oracle. All rights reserved. + * Copyright (c) 2008, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -23,7 +23,9 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.OrmEclipseLinkBasicMapping; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLink; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasic; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvert; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity; import org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context.EclipseLinkContextModelTestCase; @@ -311,15 +313,18 @@ public class EclipseLinkOrmBasicMappingTests OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = (XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); + XmlConvert xmlConvert = (XmlConvert) basicResource.getConvert(); JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); assertNull(ormBasicMapping.getConverter().getType()); - assertEquals(null, basicResource.getConvert()); + assertEquals(null, xmlConvert); //set lob in the resource model, verify context model updated - basicResource.setConvert("myConvert"); + xmlConvert = EclipseLinkOrmFactory.eINSTANCE.createXmlConvert(); + xmlConvert.setConvert("myConvert"); + basicResource.setConvert(xmlConvert); assertEquals(EclipseLinkConvert.class, ormBasicMapping.getConverter().getType()); - assertEquals("myConvert", basicResource.getConvert()); + assertEquals("myConvert", ((EclipseLinkConvert) ormBasicMapping.getConverter()).getConverterName()); //set lob to null in the resource model basicResource.setConvert(null); @@ -363,17 +368,19 @@ public class EclipseLinkOrmBasicMappingTests OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = (XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); + XmlConvert xmlConvert = (XmlConvert) basicResource.getConvert(); assertNull(ormBasicMapping.getConverter().getType()); - assertEquals(null, basicResource.getConvert()); + assertEquals(null, xmlConvert); //set lob in the context model, verify resource model updated ormBasicMapping.setConverter(EclipseLinkConvert.class); - assertEquals("none", basicResource.getConvert()); + xmlConvert = (XmlConvert) basicResource.getConvert(); + assertEquals("none", xmlConvert.getConvert()); assertEquals(EclipseLinkConvert.class, ormBasicMapping.getConverter().getType()); ((EclipseLinkConvert) ormBasicMapping.getConverter()).setSpecifiedConverterName("bar"); - assertEquals("bar", basicResource.getConvert()); + assertEquals("bar", xmlConvert.getConvert()); assertEquals(EclipseLinkConvert.class, ormBasicMapping.getConverter().getType()); assertEquals("bar", ((EclipseLinkConvert) ormBasicMapping.getConverter()).getSpecifiedConverterName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java index 51f5e6ef59..9eeb5924b7 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2012 Oracle. All rights reserved. + * Copyright (c) 2008, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -25,6 +25,8 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.OrmEclipseLinkIdMapping; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLink; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvert; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlId; import org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context.EclipseLinkContextModelTestCase; @@ -311,28 +313,31 @@ public class EclipseLinkOrmIdMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); - XmlId basicResource = (XmlId) getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); + XmlId idResource = (XmlId) getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); + XmlConvert xmlConvert = (XmlConvert) idResource.getConvert(); JavaIdMapping javaIdMapping = (JavaIdMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); assertNull(ormIdMapping.getConverter().getType()); - assertEquals(null, basicResource.getConvert()); + assertEquals(null, xmlConvert); //set lob in the resource model, verify context model updated - basicResource.setConvert("myConvert"); + xmlConvert = EclipseLinkOrmFactory.eINSTANCE.createXmlConvert(); + xmlConvert.setConvert("myConvert"); + idResource.setConvert(xmlConvert); assertEquals(EclipseLinkConvert.class, ormIdMapping.getConverter().getType()); - assertEquals("myConvert", basicResource.getConvert()); + assertEquals("myConvert", ((EclipseLinkConvert) ormIdMapping.getConverter()).getConverterName()); //set lob to null in the resource model - basicResource.setConvert(null); + idResource.setConvert(null); assertNull(ormIdMapping.getConverter().getType()); - assertEquals(null, basicResource.getConvert()); + assertEquals(null, idResource.getConvert()); javaIdMapping.setConverter(EclipseLinkConvert.class); ((EclipseLinkConvert) javaIdMapping.getConverter()).setSpecifiedConverterName("foo"); assertNull(ormIdMapping.getConverter().getType()); - assertEquals(null, basicResource.getConvert()); + assertEquals(null, idResource.getConvert()); assertEquals("foo", ((EclipseLinkConvert) javaIdMapping.getConverter()).getSpecifiedConverterName()); @@ -342,18 +347,18 @@ public class EclipseLinkOrmIdMappingTests assertEquals(EclipseLinkConvert.class, virtualIdMapping.getConverter().getType()); assertEquals("foo", ((EclipseLinkConvert) virtualIdMapping.getConverter()).getSpecifiedConverterName()); - assertEquals(null, basicResource.getConvert()); + assertEquals(null, idResource.getConvert()); assertEquals("foo", ((EclipseLinkConvert) javaIdMapping.getConverter()).getSpecifiedConverterName()); ((EclipseLinkConvert) javaIdMapping.getConverter()).setSpecifiedConverterName("bar"); assertEquals(EclipseLinkConvert.class, virtualIdMapping.getConverter().getType()); assertEquals("bar", ((EclipseLinkConvert) virtualIdMapping.getConverter()).getSpecifiedConverterName()); - assertEquals(null, basicResource.getConvert()); + assertEquals(null, idResource.getConvert()); assertEquals("bar", ((EclipseLinkConvert) javaIdMapping.getConverter()).getSpecifiedConverterName()); javaIdMapping.setConverter(null); assertNull(virtualIdMapping.getConverter().getType()); - assertNull(basicResource.getConvert()); + assertNull(idResource.getConvert()); assertNull(javaIdMapping.getConverter().getType()); } @@ -363,29 +368,31 @@ public class EclipseLinkOrmIdMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); - XmlId basicResource = (XmlId) getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); + XmlId idResource = (XmlId) getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); + XmlConvert xmlConvert = (XmlConvert) idResource.getConvert(); assertNull(ormIdMapping.getConverter().getType()); - assertNull(basicResource.getConvert()); + assertNull(xmlConvert); //set lob in the context model, verify resource model updated ormIdMapping.setConverter(EclipseLinkConvert.class); - assertEquals("none", basicResource.getConvert()); + xmlConvert = (XmlConvert) idResource.getConvert(); + assertEquals("none", xmlConvert.getConvert()); assertEquals(EclipseLinkConvert.class, ormIdMapping.getConverter().getType()); ((EclipseLinkConvert) ormIdMapping.getConverter()).setSpecifiedConverterName("bar"); - assertEquals("bar", basicResource.getConvert()); + assertEquals("bar", xmlConvert.getConvert()); assertEquals(EclipseLinkConvert.class, ormIdMapping.getConverter().getType()); assertEquals("bar", ((EclipseLinkConvert) ormIdMapping.getConverter()).getSpecifiedConverterName()); ((EclipseLinkConvert) ormIdMapping.getConverter()).setSpecifiedConverterName(null); assertNull(ormIdMapping.getConverter().getType()); - assertNull(basicResource.getConvert()); + assertNull(idResource.getConvert()); //set lob to false in the context model ormIdMapping.setConverter(null); assertNull(ormIdMapping.getConverter().getType()); - assertNull(basicResource.getConvert()); + assertNull(idResource.getConvert()); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java index fe5db261a8..9e590e151c 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2012 Oracle. All rights reserved. + * Copyright (c) 2008, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -25,6 +25,8 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVersionMapping; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.OrmEclipseLinkVersionMapping; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.EclipseLinkOrmFactory; +import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlConvert; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlEntity; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlVersion; import org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context.EclipseLinkContextModelTestCase; @@ -311,28 +313,31 @@ public class EclipseLinkOrmVersionMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); - XmlVersion basicResource = (XmlVersion) getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0); + XmlVersion versionResource = (XmlVersion) getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0); + XmlConvert xmlConvert = (XmlConvert) versionResource.getConvert(); JavaVersionMapping javaVersionMapping = (JavaVersionMapping) ormPersistentType.getJavaPersistentType().getAttributeNamed("id").getMapping(); assertNull(ormVersionMapping.getConverter().getType()); - assertEquals(null, basicResource.getConvert()); + assertEquals(null, xmlConvert); //set lob in the resource model, verify context model updated - basicResource.setConvert("myConvert"); + xmlConvert = EclipseLinkOrmFactory.eINSTANCE.createXmlConvert(); + xmlConvert.setConvert("myConvert"); + versionResource.setConvert(xmlConvert); assertEquals(EclipseLinkConvert.class, ormVersionMapping.getConverter().getType()); - assertEquals("myConvert", basicResource.getConvert()); + assertEquals("myConvert", ((EclipseLinkConvert) ormVersionMapping.getConverter()).getConverterName()); //set lob to null in the resource model - basicResource.setConvert(null); + versionResource.setConvert(null); assertNull(ormVersionMapping.getConverter().getType()); - assertEquals(null, basicResource.getConvert()); + assertEquals(null, versionResource.getConvert()); javaVersionMapping.setConverter(EclipseLinkConvert.class); ((EclipseLinkConvert) javaVersionMapping.getConverter()).setSpecifiedConverterName("foo"); assertNull(ormVersionMapping.getConverter().getType()); - assertEquals(null, basicResource.getConvert()); + assertEquals(null, versionResource.getConvert()); assertEquals("foo", ((EclipseLinkConvert) javaVersionMapping.getConverter()).getSpecifiedConverterName()); @@ -342,18 +347,18 @@ public class EclipseLinkOrmVersionMappingTests assertEquals(EclipseLinkConvert.class, virtualVersionMapping.getConverter().getType()); assertEquals("foo", ((EclipseLinkConvert) virtualVersionMapping.getConverter()).getSpecifiedConverterName()); - assertEquals(null, basicResource.getConvert()); + assertEquals(null, versionResource.getConvert()); assertEquals("foo", ((EclipseLinkConvert) javaVersionMapping.getConverter()).getSpecifiedConverterName()); ((EclipseLinkConvert) javaVersionMapping.getConverter()).setSpecifiedConverterName("bar"); assertEquals(EclipseLinkConvert.class, virtualVersionMapping.getConverter().getType()); assertEquals("bar", ((EclipseLinkConvert) virtualVersionMapping.getConverter()).getSpecifiedConverterName()); - assertEquals(null, basicResource.getConvert()); + assertEquals(null, versionResource.getConvert()); assertEquals("bar", ((EclipseLinkConvert) javaVersionMapping.getConverter()).getSpecifiedConverterName()); javaVersionMapping.setConverter(null); assertNull(virtualVersionMapping.getConverter().getType()); - assertNull(basicResource.getConvert()); + assertNull(versionResource.getConvert()); assertNull(javaVersionMapping.getConverter().getType()); } @@ -364,29 +369,31 @@ public class EclipseLinkOrmVersionMappingTests OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); - XmlVersion basicResource = (XmlVersion) getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0); + XmlVersion versionResource = (XmlVersion) getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0); + XmlConvert xmlConvert = (XmlConvert) versionResource.getConvert(); assertNull(ormVersionMapping.getConverter().getType()); - assertNull(basicResource.getConvert()); + assertNull(xmlConvert); //set lob in the context model, verify resource model updated ormVersionMapping.setConverter(EclipseLinkConvert.class); - assertEquals("none", basicResource.getConvert()); + xmlConvert = (XmlConvert) versionResource.getConvert(); + assertEquals("none", xmlConvert.getConvert()); assertEquals(EclipseLinkConvert.class, ormVersionMapping.getConverter().getType()); ((EclipseLinkConvert) ormVersionMapping.getConverter()).setSpecifiedConverterName("bar"); - assertEquals("bar", basicResource.getConvert()); + assertEquals("bar", xmlConvert.getConvert()); assertEquals(EclipseLinkConvert.class, ormVersionMapping.getConverter().getType()); assertEquals("bar", ((EclipseLinkConvert) ormVersionMapping.getConverter()).getSpecifiedConverterName()); ((EclipseLinkConvert) ormVersionMapping.getConverter()).setSpecifiedConverterName(null); assertNull(ormVersionMapping.getConverter().getType()); - assertEquals(null, basicResource.getConvert()); + assertEquals(null, versionResource.getConvert()); //set lob to false in the context model ormVersionMapping.setConverter(null); assertNull(ormVersionMapping.getConverter().getType()); - assertNull(basicResource.getConvert()); + assertNull(versionResource.getConvert()); } } |