[jboss-cvs] JBossAS SVN: r96161 - projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test.

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

Author: alesj
Date: 2009-11-09 04:33:39 -0500 (Mon, 09 Nov 2009)
New Revision: 96161

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ReflectTest.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/TypeInfoTest.java
Log:
Add domain null check.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ReflectTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ReflectTest.java	2009-11-09 09:12:28 UTC (rev 96160)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ReflectTest.java	2009-11-09 09:33:39 UTC (rev 96161)
@@ -557,7 +557,8 @@
    protected ClassLoadingMetaData createDefaultClassLoadingMetaData(String name, String parentDomain)
    {
       ClassLoadingMetaData clmd = new ClassLoadingMetaData();
-      clmd.setDomain(name + "_Domain");
+      if (name != null)
+         clmd.setDomain(name + "_Domain");
       clmd.setParentDomain(parentDomain);
       clmd.setImportAll(true);
       clmd.setExportAll(ExportAll.NON_EMPTY);

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/TypeInfoTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/TypeInfoTest.java	2009-11-09 09:12:28 UTC (rev 96160)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/TypeInfoTest.java	2009-11-09 09:33:39 UTC (rev 96161)
@@ -73,15 +73,17 @@
    protected void assertSimpleHierarchy(ClassLoader topCL, ClassLoader childCL) throws Exception
    {
       TypeInfoFactory typeInfoFactory = createTypeInfoFactory();
+
       TypeInfo ti = typeInfoFactory.getTypeInfo(AnyServlet.class.getName(), childCL);
       TypeInfo rt = assertReturnType(ti, "getBean");
       TypeInfo cti = typeInfoFactory.getTypeInfo(PlainJavaBean.class.getName(), topCL);
-      assertSame(rt, cti);
+      assertEquals(rt, cti);
    }
 
    protected void assertNonDeploymentModule(ClassLoader cl, Class<?> anysClass) throws Exception
    {
       TypeInfoFactory factory = createTypeInfoFactory();
+
       TypeInfo asTIL = factory.getTypeInfo(anysClass);
       TypeInfo pjbTI = factory.getTypeInfo(PlainJavaBean.class.getName(), cl);
       TypeInfo rtL = assertReturnType(asTIL, "getBean");
@@ -91,10 +93,12 @@
    protected void assertNonDeploymentModule(ClassLoader cl, Class<?> anysClass, Class<?> tifClass) throws Exception
    {
       TypeInfoFactory factory = createTypeInfoFactory();
+
       TypeInfo tifTIL = factory.getTypeInfo(tifClass);
       TypeInfo tifRT = assertReturnType(tifTIL, "getAnys");
       TypeInfo asTIL = factory.getTypeInfo(anysClass);
       assertEquals(tifRT, asTIL);
+
       TypeInfo pjbTI = factory.getTypeInfo(PlainJavaBean.class.getName(), cl);
       TypeInfo rtL = assertReturnType(asTIL, "getBean");
       assertEquals(pjbTI, rtL);
@@ -103,19 +107,24 @@
    protected void assertIsolated(ClassLoader cl1, ClassLoader cl2, Class<?> clazz1, Class<?> clazz2) throws Exception
    {
       TypeInfoFactory factory = createTypeInfoFactory();
+
       TypeInfo ti1 = factory.getTypeInfo(PlainJavaBean.class.getName(), cl1);
       TypeInfo ti2 = factory.getTypeInfo(PlainJavaBean.class.getName(), cl2);
       assertNotEquals(ti1, ti2);
+
       TypeInfo ti3 = factory.getTypeInfo(clazz1);
       assertEquals(ti1, ti3);
+
       TypeInfo ti4 = factory.getTypeInfo(clazz2);
       assertEquals(ti2, ti4);
+
       assertNotEquals(ti3, ti4);
    }
 
    protected void assertDomainHierarchy(ClassLoader topCL, ClassLoader leftCL, ClassLoader rightCL) throws Exception
    {
       TypeInfoFactory factory = createTypeInfoFactory();
+
       TypeInfo pjbTI = factory.getTypeInfo(PlainJavaBean.class.getName(), topCL);
       TypeInfo asTIL = factory.getTypeInfo(AnyServlet.class.getName(), leftCL);
       TypeInfo asTIR = factory.getTypeInfo(AnyServlet.class.getName(), rightCL);