[seam-commits] Seam SVN: r9352 - in branches/enterprise/JBPAPP_4_3_FP01/src: test/integration/resources and 2 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Thu Oct 16 10:16:27 EDT 2008
Author: manaRH
Date: 2008-10-16 10:16:26 -0400 (Thu, 16 Oct 2008)
New Revision: 9352
Added:
branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/resources/testProcess4.jpdl.xml
Modified:
branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/bpm/SeamExpressionEvaluator.java
branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/resources/WEB-INF/components.xml
branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java
branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java
Log:
JBPAPP-1192
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/bpm/SeamExpressionEvaluator.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/bpm/SeamExpressionEvaluator.java 2008-10-16 12:37:58 UTC (rev 9351)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/main/org/jboss/seam/bpm/SeamExpressionEvaluator.java 2008-10-16 14:16:26 UTC (rev 9352)
@@ -84,23 +84,23 @@
List<javax.el.ELException> exceptions = new ArrayList<javax.el.ELException>();
try
{
- initMethodExpression();
+ 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: branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/resources/WEB-INF/components.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/resources/WEB-INF/components.xml 2008-10-16 12:37:58 UTC (rev 9351)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/resources/WEB-INF/components.xml 2008-10-16 14:16:26 UTC (rev 9352)
@@ -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: branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/resources/testProcess4.jpdl.xml
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/resources/testProcess4.jpdl.xml (rev 0)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/resources/testProcess4.jpdl.xml 2008-10-16 14:16:26 UTC (rev 9352)
@@ -0,0 +1,16 @@
+<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>
\ No newline at end of file
Property changes on: branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/resources/testProcess4.jpdl.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java 2008-10-16 12:37:58 UTC (rev 9351)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTest.java 2008-10-16 14:16:26 UTC (rev 9352)
@@ -27,6 +27,21 @@
}.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: branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java
===================================================================
--- branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java 2008-10-16 12:37:58 UTC (rev 9351)
+++ branches/enterprise/JBPAPP_4_3_FP01/src/test/integration/src/org/jboss/seam/test/integration/bpm/SeamExpressionEvaluatorTestController.java 2008-10-16 14:16:26 UTC (rev 9352)
@@ -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");
More information about the seam-commits
mailing list