[seam-commits] Seam SVN: r8710 - in trunk/src: test/integration/resources and 2 other directories.

[seam-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-08-16 13:31:00 -0400 (Sat, 16 Aug 2008)
New Revision: 8710

Added:
   trunk/src/test/integration/resources/testProcess4.jpdl.xml
Modified:
   trunk/src/main/org/jboss/seam/bpm/SeamExpressionEvaluator.java
   trunk/src/test/integration/resources/WEB-INF/components.xml
   trunk/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java
   trunk/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java
Log:
JBSEAM-3250

Modified: trunk/src/main/org/jboss/seam/bpm/SeamExpressionEvaluator.java
===================================================================
--- trunk/src/main/org/jboss/seam/bpm/SeamExpressionEvaluator.java	2008-08-15 23:32:39 UTC (rev 8709)
+++ trunk/src/main/org/jboss/seam/bpm/SeamExpressionEvaluator.java	2008-08-16 17:31:00 UTC (rev 8710)
@@ -85,22 +85,22 @@
                 try
                 {
                     initMethodExpression(); 
+                    if (me != null)
+                    {
+                        try
+                        {
+                            return me.invoke(createELContext(resolver, mapper), new Object[0]);
+                        }
+                        catch (MethodNotFoundException e)
+                        {
+                            exceptions.add(e);
+                        }
+                    }
                 }
                 catch (javax.el.ELException e) 
                 {
                     exceptions.add(e);
                 }
-                if (me != null)
-                {
-                    try
-                    {
-                        return me.invoke(createELContext(resolver, mapper), new Object[0]);
-                    }
-                    catch (MethodNotFoundException e)
-                    {
-                        exceptions.add(e);
-                    }
-                }
                  
                 try
                 {

Modified: trunk/src/test/integration/resources/WEB-INF/components.xml
===================================================================
--- trunk/src/test/integration/resources/WEB-INF/components.xml	2008-08-15 23:32:39 UTC (rev 8709)
+++ trunk/src/test/integration/resources/WEB-INF/components.xml	2008-08-16 17:31:00 UTC (rev 8710)
@@ -33,6 +33,7 @@
             <value>testProcess1.jpdl.xml</value>
             <value>testProcess2.jpdl.xml</value>
             <value>testProcess3.jpdl.xml</value>
+            <value>testProcess4.jpdl.xml</value>
         </bpm:process-definitions>
     </bpm:jbpm>
 

Added: trunk/src/test/integration/resources/testProcess4.jpdl.xml
===================================================================
--- trunk/src/test/integration/resources/testProcess4.jpdl.xml	                        (rev 0)
+++ trunk/src/test/integration/resources/testProcess4.jpdl.xml	2008-08-16 17:31:00 UTC (rev 8710)
@@ -0,0 +1,19 @@
+<process-definition name="TestProcess4"
+                    xmlns="urn:jbpm.org:jpdl-3.2"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd">
+
+    <start-state name="start">
+        <transition to="decision" />
+    </start-state>
+    
+    <decision name="decision" expression="#{testBoolean}">
+      <transition to="done" name="true">
+         <action expression="#{seamExpressionEvaluatorTestController.logTrue}" />
+      </transition>
+      <transition to="done" name="false" />
+    </decision>
+    
+    <end-state name="done"/>
+    
+</process-definition>


Property changes on: trunk/src/test/integration/resources/testProcess4.jpdl.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: trunk/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java
===================================================================
--- trunk/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java	2008-08-15 23:32:39 UTC (rev 8709)
+++ trunk/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java	2008-08-16 17:31:00 UTC (rev 8710)
@@ -27,6 +27,22 @@
       }.run();
    }
    
+   // Test for JBSEAM-3250
+   @Test
+   public void testUnqualifiedValueExpression() throws Exception
+   {
+      new FacesRequest()
+      {
+
+         @Override
+         protected void invokeApplication() throws Exception
+         {
+            invokeAction("#{seamExpressionEvaluatorTestController.createProcess4}");
+         }
+          
+      }.run();
+   }
+   
    // Test for JBSEAM-2152
    @Test
    public void testMissingMethod() throws Exception

Modified: trunk/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java
===================================================================
--- trunk/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java	2008-08-15 23:32:39 UTC (rev 8709)
+++ trunk/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java	2008-08-16 17:31:00 UTC (rev 8710)
@@ -1,5 +1,7 @@
 package org.jboss.seam.test.integration.bpm;
 
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Factory;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.bpm.CreateProcess;
 
@@ -8,6 +10,11 @@
        
    private String name = "foo";
    
+   @Factory(value="testBoolean", scope=ScopeType.BUSINESS_PROCESS)
+   public Boolean testNameFactory()
+   {
+      return false;
+   }
    
    @CreateProcess(definition="TestProcess2") 
    public void createProcess2() 
@@ -19,6 +26,11 @@
    {            
    }
    
+   @CreateProcess(definition="TestProcess4") 
+   public void createProcess4() 
+   {
+   }
+   
    public void logTrue()
    {
       System.out.println("true");