diff options
Diffstat (limited to 'jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests')
7 files changed, 27 insertions, 27 deletions
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java index ffd20dc18a..0c75571d98 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/ContextModelTestCase.java @@ -16,6 +16,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject; import org.eclipse.jpt.common.core.tests.internal.utility.jdt.AnnotationTestCase; import org.eclipse.jpt.jpa.core.JpaPreferences; @@ -40,7 +41,6 @@ import org.eclipse.jpt.jpa.core.resource.persistence.XmlJavaClassRef; import org.eclipse.jpt.jpa.core.resource.persistence.XmlMappingFileRef; import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence; import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit; -import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource; import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; @@ -52,9 +52,9 @@ public abstract class ContextModelTestCase extends AnnotationTestCase { protected static final String BASE_PROJECT_NAME = "ContextModelTestProject"; - protected JpaXmlResource persistenceXmlResource; + protected JptXmlResource persistenceXmlResource; - protected JpaXmlResource ormXmlResource; + protected JptXmlResource ormXmlResource; protected ContextModelTestCase(String name) { @@ -140,11 +140,11 @@ public abstract class ContextModelTestCase extends AnnotationTestCase waitJob.join(); } - protected JpaXmlResource getPersistenceXmlResource() { + protected JptXmlResource getPersistenceXmlResource() { return this.persistenceXmlResource; } - protected JpaXmlResource getOrmXmlResource() { + protected JptXmlResource getOrmXmlResource() { return this.ormXmlResource; } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java index 392cd9e014..dcfc136bc3 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaFileTests.java @@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.core.tests.internal.context; import java.util.Iterator; import org.eclipse.core.resources.IFile; import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaNode; @@ -26,7 +27,6 @@ import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings; import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory; import org.eclipse.jpt.jpa.core.resource.persistence.XmlMappingFileRef; -import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource; @SuppressWarnings("nls") public class JpaFileTests @@ -112,7 +112,7 @@ public class JpaFileTests JpaFile ormXmlJpaFile = this.getJpaFile(file); assertEquals(getEntityMappings(), ormXmlJpaFile.getRootStructureNodes().iterator().next()); - JpaXmlResource resource = (JpaXmlResource) ormXmlJpaFile.getResourceModel(); + JptXmlResource resource = (JptXmlResource) ormXmlJpaFile.getResourceModel(); resource.getContents().remove(resource.getRootObject()); assertFalse(ormXmlJpaFile.getRootStructureNodes().iterator().hasNext()); @@ -128,7 +128,7 @@ public class JpaFileTests assertNotNull(getPersistenceUnit().getImpliedMappingFileRef()); assertEquals(getPersistenceUnit().getImpliedMappingFileRef().getMappingFile().getRoot(), ormXmlJpaFile.getRootStructureNodes().iterator().next()); - JpaXmlResource resource = (JpaXmlResource) ormXmlJpaFile.getResourceModel(); + JptXmlResource resource = (JptXmlResource) ormXmlJpaFile.getResourceModel(); resource.getContents().remove(resource.getRootObject()); assertFalse(ormXmlJpaFile.getRootStructureNodes().iterator().hasNext()); @@ -149,7 +149,7 @@ public class JpaFileTests JpaFile persistenceXmlJpaFile = this.getJpaFile(file); assertEquals(getRootContextNode().getPersistenceXml().getRoot(), persistenceXmlJpaFile.getRootStructureNodes().iterator().next()); - JpaXmlResource resource = (JpaXmlResource) persistenceXmlJpaFile.getResourceModel(); + JptXmlResource resource = (JptXmlResource) persistenceXmlJpaFile.getResourceModel(); resource.getContents().remove(resource.getRootObject()); assertFalse(persistenceXmlJpaFile.getRootStructureNodes().iterator().hasNext()); @@ -165,7 +165,7 @@ public class JpaFileTests assertEquals(ormPersistentType.getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next()); - JpaXmlResource resource = (JpaXmlResource) persistenceXmlJpaFile.getResourceModel(); + JptXmlResource resource = (JptXmlResource) persistenceXmlJpaFile.getResourceModel(); resource.getContents().remove(resource.getRootObject()); assertFalse(javaJpaFile.getRootStructureNodes().iterator().hasNext()); @@ -181,7 +181,7 @@ public class JpaFileTests assertEquals(getJavaPersistentType(), javaJpaFile.getRootStructureNodes().iterator().next()); - JpaXmlResource resource = (JpaXmlResource) persistenceXmlJpaFile.getResourceModel(); + JptXmlResource resource = (JptXmlResource) persistenceXmlJpaFile.getResourceModel(); resource.getContents().remove(resource.getRootObject()); assertFalse(javaJpaFile.getRootStructureNodes().iterator().hasNext()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaProjectTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaProjectTests.java index 51bf4ffe5c..27a9e1a7ff 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaProjectTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/JpaProjectTests.java @@ -13,6 +13,7 @@ import junit.framework.TestCase; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Path; import org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties; +import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaWorkspace; import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatformFactory; @@ -25,7 +26,6 @@ import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; import org.eclipse.jpt.jpa.core.platform.JpaPlatformManager; import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings; import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence; -import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource; import org.eclipse.jpt.jpa.core.tests.internal.projects.TestJpaProject; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; @@ -82,7 +82,7 @@ public class JpaProjectTests } public void testGetPersistenceXmlResource() throws Exception { - JpaXmlResource resource = this.getJpaProject().getPersistenceXmlResource(); + JptXmlResource resource = this.getJpaProject().getPersistenceXmlResource(); assertNotNull(resource); assertEquals(XmlPersistence.CONTENT_TYPE, resource.getContentType()); assertEquals("src/META-INF/persistence.xml", resource.getFile().getProjectRelativePath().toString()); @@ -109,7 +109,7 @@ public class JpaProjectTests } public void testGetDefaultOrmXmlResource() throws Exception { - JpaXmlResource resource = this.getJpaProject().getDefaultOrmXmlResource(); + JptXmlResource resource = this.getJpaProject().getDefaultOrmXmlResource(); assertNotNull(resource); assertEquals(XmlEntityMappings.CONTENT_TYPE, resource.getContentType()); assertEquals("src/META-INF/orm.xml", resource.getFile().getProjectRelativePath().toString()); @@ -145,7 +145,7 @@ public class JpaProjectTests } public void testGetMappingFileResource() throws Exception { - JpaXmlResource resource = this.getJpaProject().getMappingFileXmlResource(XmlEntityMappings.DEFAULT_RUNTIME_PATH); + JptXmlResource resource = this.getJpaProject().getMappingFileXmlResource(XmlEntityMappings.DEFAULT_RUNTIME_PATH); assertNotNull(resource); assertEquals(XmlEntityMappings.CONTENT_TYPE, resource.getContentType()); assertEquals("src/META-INF/orm.xml", resource.getFile().getProjectRelativePath().toString()); @@ -164,7 +164,7 @@ public class JpaProjectTests } public void testGetMappingFileResourceDifferentlyName() throws Exception { - JpaXmlResource resource = this.getJpaProject().getMappingFileXmlResource(new Path("META-INF/orm2.xml")); + JptXmlResource resource = this.getJpaProject().getMappingFileXmlResource(new Path("META-INF/orm2.xml")); assertNull(resource); //create the orm2.xml file diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java index 9c73b83212..bc4db503c9 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmXmlTests.java @@ -9,12 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.tests.internal.context.orm; +import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.jpa.core.context.orm.OrmXml; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings; import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory; import org.eclipse.jpt.jpa.core.resource.persistence.XmlMappingFileRef; -import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @SuppressWarnings("nls") @@ -40,7 +40,7 @@ public class OrmXmlTests extends ContextModelTestCase public void testUpdateAddEntityMappings() throws Exception { assertEquals(2, getJpaProject().getJpaFilesSize()); - JpaXmlResource ormResource = getOrmXmlResource(); + JptXmlResource ormResource = getOrmXmlResource(); ormResource.getContents().clear(); ormResource.save(null); @@ -58,7 +58,7 @@ public class OrmXmlTests extends ContextModelTestCase } public void testUpdateRemoveEntityMappings() throws Exception { - JpaXmlResource ormResource = getOrmXmlResource(); + JptXmlResource ormResource = getOrmXmlResource(); assertNotNull(getOrmXml().getRoot()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTests.java index 17efa5c01a..01298b3b86 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceUnitTests.java @@ -14,6 +14,7 @@ import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; +import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.common.utility.internal.CollectionTools; import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.common.utility.internal.iterators.ArrayIterator; @@ -36,7 +37,6 @@ import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnit; import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistenceUnitTransactionType; import org.eclipse.jpt.jpa.core.resource.persistence.XmlProperties; import org.eclipse.jpt.jpa.core.resource.persistence.XmlProperty; -import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; @@ -395,7 +395,7 @@ public class PersistenceUnitTests extends ContextModelTestCase PersistenceUnit persistenceUnit = getPersistenceUnit(); // test that there is one initially - JpaXmlResource ormResource = getOrmXmlResource(); + JptXmlResource ormResource = getOrmXmlResource(); assertTrue(ormResource.fileExists()); assertNotNull(persistenceUnit.getImpliedMappingFileRef()); @@ -411,7 +411,7 @@ public class PersistenceUnitTests extends ContextModelTestCase PersistenceUnit persistenceUnit = getPersistenceUnit(); // test that there is one initially - JpaXmlResource ormResource = getOrmXmlResource(); + JptXmlResource ormResource = getOrmXmlResource(); assertTrue(ormResource.fileExists()); assertNotNull(persistenceUnit.getImpliedMappingFileRef()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java index 6f7e9f8a2c..246c9cc374 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/PersistenceXmlTests.java @@ -9,10 +9,10 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.tests.internal.context.persistence; +import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXml; import org.eclipse.jpt.jpa.core.resource.persistence.PersistenceFactory; import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence; -import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; @SuppressWarnings("nls") @@ -28,7 +28,7 @@ public class PersistenceXmlTests extends ContextModelTestCase public void testUpdateAddPersistence() throws Exception { assertEquals(2, getJpaProject().getJpaFilesSize()); - JpaXmlResource prm = getPersistenceXmlResource(); + JptXmlResource prm = getPersistenceXmlResource(); prm.getContents().clear(); prm.save(null); @@ -46,7 +46,7 @@ public class PersistenceXmlTests extends ContextModelTestCase } public void testUpdateRemovePersistence() throws Exception { - JpaXmlResource prm = getPersistenceXmlResource(); + JptXmlResource prm = getPersistenceXmlResource(); assertNotNull(getPersistenceXml().getRoot()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/RootContextNodeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/RootContextNodeTests.java index 82354ff11b..c3d00e3518 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/RootContextNodeTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/persistence/RootContextNodeTests.java @@ -10,9 +10,9 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.persistence; import org.eclipse.jpt.common.core.internal.operations.JptFileCreationDataModelProperties; +import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.jpa.core.context.JpaRootContextNode; import org.eclipse.jpt.jpa.core.internal.operations.PersistenceFileCreationDataModelProvider; -import org.eclipse.jpt.jpa.core.resource.xml.JpaXmlResource; import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; @@ -41,7 +41,7 @@ public class RootContextNodeTests extends ContextModelTestCase } public void testUpdateRemovePersistenceXml() throws Exception { - JpaXmlResource pr = getPersistenceXmlResource(); + JptXmlResource pr = getPersistenceXmlResource(); JpaRootContextNode baseJpaContent = getJavaProject().getJpaProject().getRootContextNode(); assertNotNull(baseJpaContent.getPersistenceXml()); |