[jboss-cvs] JBossAS SVN: r93621 - in projects/jboss-jsr303/trunk/deployers/src/test/java/org/jboss/test/deployers: test and 1 other directory.

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

Author: stan.silvert at jboss.com
Date: 2009-09-16 13:23:31 -0400 (Wed, 16 Sep 2009)
New Revision: 93621

Modified:
   projects/jboss-jsr303/trunk/deployers/src/test/java/org/jboss/test/deployers/support/MockInitialContextFactory.java
   projects/jboss-jsr303/trunk/deployers/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java
Log:
Add JSR-303 Bean Validation to AS 5.2 & Trunk
Fix tests


Modified: projects/jboss-jsr303/trunk/deployers/src/test/java/org/jboss/test/deployers/support/MockInitialContextFactory.java
===================================================================
--- projects/jboss-jsr303/trunk/deployers/src/test/java/org/jboss/test/deployers/support/MockInitialContextFactory.java	2009-09-16 17:22:06 UTC (rev 93620)
+++ projects/jboss-jsr303/trunk/deployers/src/test/java/org/jboss/test/deployers/support/MockInitialContextFactory.java	2009-09-16 17:23:31 UTC (rev 93621)
@@ -36,18 +36,18 @@
 
 /**
  * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ * @author <a href="mailto:stan.silvert at jboss.org">Stan Silvert</a>
  */
 public class MockInitialContextFactory implements InitialContextFactory
 {
-   public static Context initialContext = new MockContext();
+   public static final Context initialContext = new MockContext();
    
-   
    public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException
    {
       return initialContext;
    }
       
-   private static class MockContext implements Context
+   public static class MockContext implements Context
    {
       private Map<Object, Object> map = new HashMap<Object, Object>();
 
@@ -127,20 +127,26 @@
 
       public void destroySubcontext(Name name) throws NamingException
       {
+         map.remove(name);
       }
 
       public void destroySubcontext(String name) throws NamingException
       {
+         map.remove(name);
       }
 
       public Context createSubcontext(Name name) throws NamingException
       {
-         return new MockContext();
+         MockContext subContext = new MockContext();
+         map.put(name, subContext);
+         return subContext;
       }
 
       public Context createSubcontext(String name) throws NamingException
       {
-         return new MockContext();
+         MockContext subContext = new MockContext();
+         map.put(name, subContext);
+         return subContext;
       }
 
       public Object lookupLink(Name name) throws NamingException

Modified: projects/jboss-jsr303/trunk/deployers/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java
===================================================================
--- projects/jboss-jsr303/trunk/deployers/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java	2009-09-16 17:22:06 UTC (rev 93620)
+++ projects/jboss-jsr303/trunk/deployers/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java	2009-09-16 17:23:31 UTC (rev 93621)
@@ -21,6 +21,8 @@
  */
 package org.jboss.test.deployers.test;
 
+import javax.naming.Context;
+import javax.naming.Reference;
 import javax.validation.ValidatorFactory;
 
 import junit.framework.Test;
@@ -28,6 +30,7 @@
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.test.deployers.BootstrapDeployersTest;
 import org.jboss.test.deployers.support.MockInitialContextFactory;
+import org.jboss.util.naming.NonSerializableFactory;
 
 /**
  * Simple "smoke" tests.
@@ -54,18 +57,27 @@
          ValidatorFactory factory = unit.getAttachment(ValidatorFactory.class);
          assertNotNull(factory);
          
-         String jndiName = DefaultJndiBinder.BV_FACTORY_JNDI_SUBCONTEXT + "/smoke-beans.xml";
-         ValidatorFactory factoryFromJNDI = (ValidatorFactory)MockInitialContextFactory.initialContext.lookup(jndiName);
-         //System.out.println("context dump=" + MockInitialContextFactory.initialContext.toString());
-         //assertNotNull(factoryFromJNDI);
+         Context subContext = getBVFactorySubcontext();
+         assertNotNull(subContext);
          
-         //assertSame(factory, factoryFromJNDI);
+         Reference reference = (Reference)subContext.lookup("smoke-beans.xml");
+         NonSerializableFactory nsFactory = new NonSerializableFactory();
+         
+         ValidatorFactory factoryFromJNDI = (ValidatorFactory)nsFactory.getObjectInstance(reference, null, null, null);
+         assertNotNull(factoryFromJNDI);
+         
+         assertSame(factory, factoryFromJNDI);
       }
       finally
       {
          undeploy(unit);
-         
-//         assertNull(MockVFJndiBinderDeployer.context.lookup("java:comp/env/smoke-beans.xml"));
+         assertNull(getBVFactorySubcontext().lookup("smoke-beans.xml"));
       }
    }
+   
+   private Context getBVFactorySubcontext() throws Exception
+   {
+      Context initialContext = MockInitialContextFactory.initialContext;
+      return (Context)initialContext.lookup(DefaultJndiBinder.BV_FACTORY_JNDI_SUBCONTEXT);
+   }
 }