[jboss-cvs] JBossAS SVN: r82749 - in projects/ejb3/trunk: testsuite/src/test/java/org/jboss/ejb3/test/persistenceunits/unit and 1 other directory.

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

Author: ALRubinger
Date: 2009-01-10 04:39:47 -0500 (Sat, 10 Jan 2009)
New Revision: 82749

Modified:
   projects/ejb3/trunk/core/src/main/java/org/jboss/injection/PersistenceUnitHandler.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/persistenceunits/unit/MultipleEarTestCase.java
Log:
[EJBTHREE-1241] Fix "persistenceunits" tests by supplying a contracted error message to be checked by the tests

Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/injection/PersistenceUnitHandler.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/injection/PersistenceUnitHandler.java	2009-01-10 05:04:51 UTC (rev 82748)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/injection/PersistenceUnitHandler.java	2009-01-10 09:39:47 UTC (rev 82749)
@@ -50,6 +50,11 @@
 public class PersistenceUnitHandler<X extends RemoteEnvironment> implements InjectionHandler<X>
 {
    private static final Logger log = Logger.getLogger(PersistenceUnitHandler.class);
+   
+   /**
+    * Contracted error message value, form may be checked from Integration Tests
+    */
+   public static final String ERROR_MESSAGE_FAILED_TO_RESOVLE_PU = " failed to resolve persistence unit ";
 
    public void loadXml(X xml, InjectionContainer container)
    {
@@ -127,7 +132,7 @@
          }
          catch(IllegalArgumentException e)
          {
-            throw new IllegalArgumentException("Container " + container + " failed to resolve persistence unit " + unitName, e);
+            throw new IllegalArgumentException("Container " + container + ERROR_MESSAGE_FAILED_TO_RESOVLE_PU + unitName, e);
          }
          return;
       }

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/persistenceunits/unit/MultipleEarTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/persistenceunits/unit/MultipleEarTestCase.java	2009-01-10 05:04:51 UTC (rev 82748)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/persistenceunits/unit/MultipleEarTestCase.java	2009-01-10 09:39:47 UTC (rev 82749)
@@ -31,6 +31,7 @@
 import org.jboss.ejb3.test.persistenceunits.Entity1;
 import org.jboss.ejb3.test.persistenceunits.Entity2;
 import org.jboss.ejb3.test.persistenceunits.EntityTest;
+import org.jboss.injection.PersistenceUnitHandler;
 import org.jboss.logging.Logger;
 import org.jboss.test.JBossTestCase;
 
@@ -90,7 +91,11 @@
          assertEquals("only persistenceunitscope-test2.ear should have failed", 1, deploymentsInError.size());
          Map.Entry<String, Throwable> entry = deploymentsInError.entrySet().iterator().next();
          assertTrue(entry.getKey().endsWith("persistenceunitscope-test2.ear"));
-         assertTrue(entry.getValue().getMessage().contains("Can't find a persistence unit named 'Entity1'"));
+
+         // Check that it's Entity1 PU that cannot be resolved 
+         String message = entry.getValue().getMessage();
+         assertTrue(message.contains(PersistenceUnitHandler.ERROR_MESSAGE_FAILED_TO_RESOVLE_PU));
+         assertTrue(message.contains("Entity1"));
       }
    }