Author: gk
Date: Fri Jun 22 14:24:41 2018
New Revision: 1834140
URL: http://svn.apache.org/viewvc?rev=1834140&view=rev
Log:
- fix in role check any in AnnotationProcessor
- extend velocity test
Modified:
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java
Modified:
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java?rev=1834140&r1=1834139&r2=1834140&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
Fri Jun 22 14:24:41 2018
@@ -138,6 +138,9 @@ public class AnnotationProcessor
break;
}
}
+ if (conditonType == ConditionType.ANY) { // nothing matched
+ return false;
+ }
}
else
{
Modified:
turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java?rev=1834140&r1=1834139&r2=1834140&view=diff
==============================================================================
---
turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java
(original)
+++
turbine/core/trunk/src/test/org/apache/turbine/modules/ActionLoaderTest.java
Fri Jun 22 14:24:41 2018
@@ -37,9 +37,11 @@ import org.apache.turbine.Turbine;
import org.apache.turbine.modules.actions.VelocityActionDoesNothing;
import org.apache.turbine.pipeline.DefaultPipelineData;
import org.apache.turbine.pipeline.PipelineData;
+import org.apache.turbine.services.velocity.VelocityService;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
+import org.apache.velocity.context.Context;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -320,6 +322,9 @@ public class ActionLoaderTest extends Ba
try
{
ActionLoader.getInstance().exec(pipelineData, data.getAction());
+ Context context = (Context)
+
data.getTemplateInfo().getTemplateContext(VelocityService.CONTEXT);
+ assertTrue( context.get( "mykey" ) != null );
}
catch (Exception e)
{
