HHH-7028 Fixing annotation based tests (refactoring of sources)

hibernate · Feb 7, 2012 · 14c0339 · 14c0339
1 parent b27462f
commit 14c0339
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 20 deletions.
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/MetadataImplTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/MetadataImplTest.java
@@ -32,9 +32,9 @@
 import org.hibernate.metamodel.Metadata;
 import org.hibernate.metamodel.MetadataSources;
 import org.hibernate.metamodel.SessionFactoryBuilder;
-import org.hibernate.metamodel.spi.binding.FetchProfile;
 import org.hibernate.metamodel.internal.MetadataImpl;
 import org.hibernate.metamodel.internal.SessionFactoryBuilderImpl;
+import org.hibernate.metamodel.spi.binding.FetchProfile;
 import org.hibernate.service.ServiceRegistryBuilder;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 
@@ -72,7 +72,7 @@ public void testAddingNonExistingPackageName() {
 	@Test
 	public void testAddingPackageName() {
 		MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
-		sources.addPackage( "org.hibernate.metamodel.source.internal" );
+		sources.addPackage( MetadataImplTest.class.getPackage().getName() );
 		MetadataImpl metadata = (MetadataImpl) sources.buildMetadata();
 
 		assertFetchProfile( metadata );
@@ -81,7 +81,7 @@ public void testAddingPackageName() {
 	@Test
 	public void testAddingPackageNameWithTrailingDot() {
 		MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
-		sources.addPackage( "org.hibernate.metamodel.source.internal." );
+		sources.addPackage( MetadataImplTest.class.getPackage().getName() + "." );
 		MetadataImpl metadata = (MetadataImpl) sources.buildMetadata();
 
 		assertFetchProfile( metadata );

diff --git a/...java/org/hibernate/metamodel/internal/source/annotations/entity/QuotedIdentifierTest.java b/...java/org/hibernate/metamodel/internal/source/annotations/entity/QuotedIdentifierTest.java
@@ -39,7 +39,7 @@
  * @author Strong Liu
  */
 public class QuotedIdentifierTest extends BaseAnnotationBindingTestCase {
-	private final String ormPath = "org/hibernate/metamodel/source/annotations/xml/orm-quote-identifier.xml";
+	private final String ormPath = "org/hibernate/metamodel/internal/source/annotations/xml/orm-quote-identifier.xml";
 
 	@Test
 	@Resources(annotatedClasses = { Item.class, Item2.class, Item3.class, Item4.class }, ormXmlPath = ormPath)

diff --git a/.../test/java/org/hibernate/metamodel/internal/source/annotations/xml/OrmXmlParserTests.java b/.../test/java/org/hibernate/metamodel/internal/source/annotations/xml/OrmXmlParserTests.java
@@ -41,7 +41,7 @@ public class OrmXmlParserTests extends BaseUnitTestCase {
 	@Test
 	public void testSimpleOrmVersion2() {
 		MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
-		sources.addResource( "org/hibernate/metamodel/source/annotations/xml/orm-father.xml" );
+		sources.addResource( "org/hibernate/metamodel/internal/source/annotations/xml/orm-father.xml" );
 		MetadataImpl metadata = (MetadataImpl) sources.buildMetadata();
 
 		EntityBinding binding = metadata.getEntityBinding( Father.class.getName() );
@@ -51,7 +51,7 @@ public void testSimpleOrmVersion2() {
 	@Test
 	public void testSimpleOrmVersion1() {
 		MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
-		sources.addResource( "org/hibernate/metamodel/source/annotations/xml/orm-star.xml" );
+		sources.addResource( "org/hibernate/metamodel/internal/source/annotations/xml/orm-star.xml" );
 		MetadataImpl metadata = (MetadataImpl) sources.buildMetadata();
 
 		EntityBinding binding = metadata.getEntityBinding( Star.class.getName() );
@@ -61,7 +61,7 @@ public void testSimpleOrmVersion1() {
 	@Test(expected = MappingException.class)
 	public void testInvalidOrmXmlThrowsException() {
 		MetadataSources sources = new MetadataSources( new ServiceRegistryBuilder().buildServiceRegistry() );
-		sources.addResource( "org/hibernate/metamodel/source/annotations/xml/orm-invalid.xml" );
+		sources.addResource( "org/hibernate/metamodel/internal/source/annotations/xml/orm-invalid.xml" );
 		sources.buildMetadata();
 	}
 }

diff --git a/...va/org/hibernate/metamodel/internal/source/annotations/xml/mocker/EntityListenerTest.java b/...va/org/hibernate/metamodel/internal/source/annotations/xml/mocker/EntityListenerTest.java
@@ -56,7 +56,5 @@ public void basicEntityListenerMockTest() {
 		assertHasAnnotation( index, PseudoJpaDotNames.DEFAULT_ENTITY_LISTENERS );
 		assertHasAnnotation( index, PseudoJpaDotNames.DEFAULT_PRE_PERSIST );
 		assertHasAnnotation( index, PseudoJpaDotNames.DEFAULT_POST_PERSIST );
-
-
 	}
 }
diff --git a/...otations/xml/mocker/AttributeOverride.xml → ...otations/xml/mocker/AttributeOverride.xml b/...otations/xml/mocker/AttributeOverride.xml → ...otations/xml/mocker/AttributeOverride.xml
@@ -8,7 +8,7 @@
 			<cascade-persist/>
 		</persistence-unit-defaults>
 	</persistence-unit-metadata>
-	<package>org.hibernate.metamodel.source.annotations.xml.mocker</package>
+	<package>org.hibernate.metamodel.internal.source.annotations.xml.mocker</package>
 
 	<entity class="Book">
 		<attributes>

diff --git a/...annotations/xml/mocker/default-schema.xml → ...annotations/xml/mocker/default-schema.xml b/...annotations/xml/mocker/default-schema.xml → ...annotations/xml/mocker/default-schema.xml
diff --git a/...nnotations/xml/mocker/default-schema2.xml → ...nnotations/xml/mocker/default-schema2.xml b/...nnotations/xml/mocker/default-schema2.xml → ...nnotations/xml/mocker/default-schema2.xml
@@ -3,7 +3,7 @@
 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
 				 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 				 version="2.0">
-	<package>org.hibernate.metamodel.source.annotations.xml.mocker</package>
+	<package>org.hibernate.metamodel.internal.source.annotations.xml.mocker</package>
 	<schema>XML_SCHEMA</schema>
 	<catalog>XML_CATALOG</catalog>
 </entity-mappings>
diff --git a/...s/xml/mocker/entity-metadata-complete.xml → ...s/xml/mocker/entity-metadata-complete.xml b/...s/xml/mocker/entity-metadata-complete.xml → ...s/xml/mocker/entity-metadata-complete.xml
@@ -3,7 +3,7 @@
 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
 				 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 				 version="2.0">
-	<package>org.hibernate.metamodel.source.annotations.xml.mocker</package>
+	<package>org.hibernate.metamodel.internal.source.annotations.xml.mocker</package>
 	<entity class="Author" metadata-complete="true">
 		<id-class class="Topic"/>
 	</entity>

diff --git a/...ource/annotations/xml/mocker/listener.xml → ...ource/annotations/xml/mocker/listener.xml b/...ource/annotations/xml/mocker/listener.xml → ...ource/annotations/xml/mocker/listener.xml
@@ -8,17 +8,17 @@
             <delimited-identifiers/>
             <access>FIELD</access>
             <entity-listeners>
-                <entity-listener class="org.hibernate.metamodel.source.annotations.xml.mocker.ItemListener">
+                <entity-listener class="org.hibernate.metamodel.internal.source.annotations.xml.mocker.ItemListener">
                     <pre-persist method-name="prePersist"/>
                     <post-persist method-name="postPersist"/>
                 </entity-listener>
             </entity-listeners>
         </persistence-unit-defaults>
     </persistence-unit-metadata>
-    <package>org.hibernate.metamodel.source.annotations.xml.mocker</package>
+    <package>org.hibernate.metamodel.internal.source.annotations.xml.mocker</package>
     <entity class="Item">
         <entity-listeners>
-            <entity-listener class="org.hibernate.metamodel.source.annotations.xml.mocker.ItemListener">
+            <entity-listener class="org.hibernate.metamodel.internal.source.annotations.xml.mocker.ItemListener">
                 <pre-persist method-name="prePersist"/>
                 <post-persist method-name="postPersist"/>
             </entity-listener>

diff --git a/...l/mocker/override-to-mappedsuperclass.xml → ...l/mocker/override-to-mappedsuperclass.xml b/...l/mocker/override-to-mappedsuperclass.xml → ...l/mocker/override-to-mappedsuperclass.xml
@@ -3,7 +3,7 @@
 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  version="2.0">
-    <package>org.hibernate.metamodel.source.annotations.xml.mocker</package>
+    <package>org.hibernate.metamodel.internal.source.annotations.xml.mocker</package>
     <mapped-superclass class="Book">
         <attributes>
             <element-collection name="topics">

diff --git a/...tions/xml/mocker/persistence-metadata.xml → ...tions/xml/mocker/persistence-metadata.xml b/...tions/xml/mocker/persistence-metadata.xml → ...tions/xml/mocker/persistence-metadata.xml
@@ -8,7 +8,7 @@
             <delimited-identifiers/>
             <access>FIELD</access>
             <entity-listeners>
-                <entity-listener class="org.hibernate.metamodel.source.annotations.xml.mocker.ItemListener">
+                <entity-listener class="org.hibernate.metamodel.internal.source.annotations.xml.mocker.ItemListener">
                     <pre-persist method-name="prePersist"/>
                     <post-persist method-name="postPersist"/>
                 </entity-listener>

diff --git a/...del/source/annotations/xml/orm-father.xml → ...nal/source/annotations/xml/orm-father.xml b/...del/source/annotations/xml/orm-father.xml → ...nal/source/annotations/xml/orm-father.xml
@@ -3,7 +3,7 @@
 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  version="2.0">
-    <package>org.hibernate.metamodel.source.annotations.xml</package>
+    <package>org.hibernate.metamodel.internal.source.annotations.xml</package>
 
     <entity class="Father">
         <attributes>

diff --git a/...el/source/annotations/xml/orm-invalid.xml → ...al/source/annotations/xml/orm-invalid.xml b/...el/source/annotations/xml/orm-invalid.xml → ...al/source/annotations/xml/orm-invalid.xml
@@ -3,7 +3,7 @@
 <entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  version="2.0">
-    <package>org.hibernate.metamodel.source.annotations.xml</package>
+    <package>org.hibernate.metamodel.internal.source.annotations.xml</package>
     <entity class="Star" access="FIELD" metadata-complete="false" foo="bar">
         <attributes>
             <id name="id">

diff --git a/.../annotations/xml/orm-quote-identifier.xml → .../annotations/xml/orm-quote-identifier.xml b/.../annotations/xml/orm-quote-identifier.xml → .../annotations/xml/orm-quote-identifier.xml
diff --git a/...model/source/annotations/xml/orm-star.xml → ...ernal/source/annotations/xml/orm-star.xml b/...model/source/annotations/xml/orm-star.xml → ...ernal/source/annotations/xml/orm-star.xml
@@ -4,7 +4,7 @@
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  version="1.0">
     <!-- use orm_1_0 on purpose to test backward compatibility -->
-    <package>org.hibernate.metamodel.source.annotations.xml</package>
+    <package>org.hibernate.metamodel.internal.source.annotations.xml</package>
     <entity class="Star" access="FIELD" metadata-complete="false">
         <attributes>
             <id name="id">