[jboss-cvs] JBossAS SVN: r103582 - in projects/scanning/trunk: testsuite/src/test/java/org/jboss/test/scanning/hibernate/test and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 6 11:32:27 EDT 2010
Author: alesj
Date: 2010-04-06 11:32:27 -0400 (Tue, 06 Apr 2010)
New Revision: 103582
Modified:
projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternFilter.java
projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternVisitor.java
projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java
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:
More hib tests.
Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternFilter.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternFilter.java 2010-04-06 15:27:26 UTC (rev 103581)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternFilter.java 2010-04-06 15:32:27 UTC (rev 103582)
@@ -75,12 +75,7 @@
throw new IllegalArgumentException("Null resource");
String name = resource.getResourceName();
- int p = name.lastIndexOf(".");
+ int p = name.lastIndexOf("/");
return (p >= 0) ? name.substring(p + 1) : name;
}
-
- public String getPattern()
- {
- return pattern;
- }
}
\ No newline at end of file
Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternVisitor.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternVisitor.java 2010-04-06 15:27:26 UTC (rev 103581)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/PatternVisitor.java 2010-04-06 15:32:27 UTC (rev 103582)
@@ -35,6 +35,7 @@
*/
public class PatternVisitor implements ResourceVisitor
{
+ private final String pattern;
private final PatternFilter filter;
private final ScannerImpl scanner;
@@ -45,6 +46,7 @@
if (scanner == null)
throw new IllegalArgumentException("Null scanner");
+ this.pattern = pattern;
this.filter = new PatternFilter(pattern);
this.scanner = scanner;
}
@@ -57,6 +59,6 @@
public void visit(ResourceContext resource)
{
URL ownerURL = scanner.getOwnerURL(resource);
- scanner.addFile(ownerURL, filter.getPattern(), new LazyNamedInputStream(resource));
+ scanner.addFile(ownerURL, pattern, new LazyNamedInputStream(resource));
}
}
\ No newline at end of file
Modified: projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java
===================================================================
--- projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java 2010-04-06 15:27:26 UTC (rev 103581)
+++ projects/scanning/trunk/plugins/src/main/java/org/jboss/scanning/hibernate/ScannerImpl.java 2010-04-06 15:32:27 UTC (rev 103582)
@@ -190,7 +190,7 @@
throw new IllegalArgumentException("Null annotations to look for");
if (annotationsToLookFor.size() > 0)
- throw new AssertionFailure("Improper use of NativeScanner: must not filter packages");
+ throw new AssertionFailure("Improper use of MC Scanner: must not filter packages");
String path = jarToScan.getPath();
Set<Package> p = packages.get(path);
@@ -357,7 +357,8 @@
throw new RuntimeException(e);
}
}
- result.addAll(niss);
+ if (niss != null)
+ result.addAll(niss);
}
}
}
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-04-06 15:27:26 UTC (rev 103581)
+++ projects/scanning/trunk/testsuite/src/test/java/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.java 2010-04-06 15:32:27 UTC (rev 103582)
@@ -22,9 +22,16 @@
package org.jboss.test.scanning.hibernate.test;
+import javax.persistence.Embedded;
import javax.persistence.Entity;
+import javax.persistence.MappedSuperclass;
+import java.lang.annotation.Annotation;
import java.net.URL;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
import org.jboss.classloader.plugins.filter.CombiningClassFilter;
import org.jboss.classloader.spi.ClassLoaderSystem;
@@ -39,6 +46,7 @@
import org.jboss.vfs.VirtualFile;
import junit.framework.Test;
+import org.hibernate.ejb.packaging.NamedInputStream;
import org.hibernate.ejb.packaging.Scanner;
/**
@@ -78,7 +86,19 @@
{
Scanner scanner = unit.getAttachment(Scanner.class);
assertNotNull(scanner);
- // TODO
+ // files
+ Set<NamedInputStream> files = scanner.getFilesInJar(url, Collections.singleton("**/*.hbm.xml"));
+ assertNotNull(files);
+ assertEquals(1, files.size());
+ // packages
+ Set<Package> pckgs = scanner.getPackagesInJar(url, Collections.<Class<? extends Annotation>>emptySet());
+ assertNotNull(pckgs);
+ assertEquals(1, pckgs.size());
+ // annotations
+ final HashSet<Class<? extends Annotation>> annotationsToLookFor = new HashSet<Class<? extends Annotation>>(Arrays.asList(Entity.class, Embedded.class, MappedSuperclass.class));
+ Set<Class<?>> annotatedClasses = scanner.getClassesInJar(url, annotationsToLookFor);
+ assertNotNull(annotatedClasses);
+ assertEquals(2, annotatedClasses.size());
}
finally
{
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-04-06 15:27:26 UTC (rev 103581)
+++ projects/scanning/trunk/testsuite/src/test/resources/org/jboss/test/scanning/hibernate/test/HibernateUnitTestCase.xml 2010-04-06 15:32:27 UTC (rev 103582)
@@ -10,14 +10,14 @@
<bean name="HibScanningPlugin" class="org.jboss.scanning.hibernate.HibernateScanningPluginFactory">
<property name="annotations">
<set elementClass="java.lang.Class">
- javax.persistence.Entity
- javax.persistence.MappedSuperclass
- javax.persistence.Embeddable
+ <value>javax.persistence.Entity</value>
+ <value>javax.persistence.MappedSuperclass</value>
+ <value>javax.persistence.Embeddable</value>
</set>
</property>
<property name="patterns">
<set>
- **/*.hbm.xml
+ <value>**/*.hbm.xml</value>
</set>
</property>
</bean>
More information about the jboss-cvs-commits
mailing list