[jboss-cvs] JBossAS SVN: r107256 - in projects/scanning/trunk/testsuite/src/test: resources/hibernate/ext.ear/ext.jar/META-INF and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2010-08-02 05:55:57 -0400 (Mon, 02 Aug 2010)
New Revision: 107256

Added:
   projects/scanning/trunk/testsuite/src/test/resources/hibernate/ext.ear/ext.jar/META-INF/orm.xml
   projects/scanning/trunk/testsuite/src/test/resources/hibernate/ext.ear/par.jar/META-INF/orm.xml
Modified:
   projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java
   projects/scanning/trunk/testsuite/src/test/resources/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.xml
Log:
Test orm.xml usage.

Modified: projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java
===================================================================
--- projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java	2010-08-02 08:12:59 UTC (rev 107255)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java	2010-08-02 09:55:57 UTC (rev 107256)
@@ -49,6 +49,8 @@
  */
 public class HibernateUnitTestCase extends ScanningDeployersTest
 {
+   private Set<String> patterns = new HashSet<String>(Arrays.asList("**/*.hbm.xml", "orm.xml"));
+
    public HibernateUnitTestCase(String name)
    {
       super(name);
@@ -81,9 +83,9 @@
          assertNotNull(annotatedClasses);
          assertEquals(3, annotatedClasses.size());
          // files
-         Set<NamedInputStream> files = scanner.getFilesInJar(url, Collections.singleton("**/*.hbm.xml"));
+         Set<NamedInputStream> files = scanner.getFilesInJar(url, patterns);
          assertNotNull(files);
-         assertEquals(1, files.size());
+         assertEquals(2, files.size());
          // packages
          Set<Package> pckgs = scanner.getPackagesInJar(url, Collections.<Class<? extends Annotation>>emptySet());
          assertNotNull(pckgs);
@@ -118,9 +120,9 @@
          assertNotNull(classes);
          assertEquals(1, classes.size());
          // files
-         Set<NamedInputStream> files = scanner.getFilesInJar(url, Collections.singleton("**/*.hbm.xml"));
+         Set<NamedInputStream> files = scanner.getFilesInJar(url, patterns);
          assertNotNull(files);
-         assertEquals(1, files.size());
+         assertEquals(2, files.size());
          // packages
          Set<Package> pckgs = scanner.getPackagesInJar(url, Collections.<Class<? extends Annotation>>emptySet());
          assertNotNull(pckgs);

Added: projects/scanning/trunk/testsuite/src/test/resources/hibernate/ext.ear/ext.jar/META-INF/orm.xml
===================================================================
--- projects/scanning/trunk/testsuite/src/test/resources/hibernate/ext.ear/ext.jar/META-INF/orm.xml	                        (rev 0)
+++ projects/scanning/trunk/testsuite/src/test/resources/hibernate/ext.ear/ext.jar/META-INF/orm.xml	2010-08-02 09:55:57 UTC (rev 107256)
@@ -0,0 +1 @@
+<orm/>

Added: projects/scanning/trunk/testsuite/src/test/resources/hibernate/ext.ear/par.jar/META-INF/orm.xml
===================================================================
--- projects/scanning/trunk/testsuite/src/test/resources/hibernate/ext.ear/par.jar/META-INF/orm.xml	                        (rev 0)
+++ projects/scanning/trunk/testsuite/src/test/resources/hibernate/ext.ear/par.jar/META-INF/orm.xml	2010-08-02 09:55:57 UTC (rev 107256)
@@ -0,0 +1 @@
+<orm/>

Modified: projects/scanning/trunk/testsuite/src/test/resources/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.xml
===================================================================
--- projects/scanning/trunk/testsuite/src/test/resources/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.xml	2010-08-02 08:12:59 UTC (rev 107255)
+++ projects/scanning/trunk/testsuite/src/test/resources/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.xml	2010-08-02 09:55:57 UTC (rev 107256)
@@ -21,6 +21,7 @@
       <property name="patterns">
           <set>
               <value>**/*.hbm.xml</value>
+              <value>orm.xml</value>
           </set>
       </property>
   </bean>