You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by ml...@apache.org on 2013/08/06 18:45:00 UTC
[1/2] git commit: Fix javadoc to reflect actual behavior
Updated Branches:
refs/heads/master a9173f9a7 -> 6460e445c
Fix javadoc to reflect actual behavior
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/974adcc7
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/974adcc7
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/974adcc7
Branch: refs/heads/master
Commit: 974adcc72cc3e89b88e0d5a27c353de89781f5dc
Parents: a9173f9
Author: Massimo Lusetti <ml...@apache.org>
Authored: Tue Aug 6 11:45:58 2013 +0200
Committer: Massimo Lusetti <ml...@apache.org>
Committed: Tue Aug 6 11:45:58 2013 +0200
----------------------------------------------------------------------
.../org/apache/tapestry5/annotations/PageActivationContext.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/974adcc7/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageActivationContext.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageActivationContext.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageActivationContext.java
index 19938de..9d70f5c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageActivationContext.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageActivationContext.java
@@ -28,8 +28,7 @@ import org.apache.tapestry5.ioc.annotations.UseWith;
* In order to use this annotation you must contribute a {@link org.apache.tapestry5.ValueEncoder} for the class of the
* annotated property.
* <p/>
- * You should not use this annotation within a class that already has an onActivate() or onPassivate() method; doing so
- * will result in a runtime exception.
+ * You should not use this annotation more than once per page class; doing it will result in a runtime exception.
*/
@Target(FIELD)
@Documented
[2/2] git commit: TAP5-2070 fix some tests
Posted by ml...@apache.org.
TAP5-2070 fix some tests
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6460e445
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6460e445
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6460e445
Branch: refs/heads/master
Commit: 6460e445c58dc53b23f0c749b9c1cea58e093f36
Parents: 974adcc
Author: Massimo Lusetti <ml...@apache.org>
Authored: Tue Aug 6 18:43:37 2013 +0200
Committer: Massimo Lusetti <ml...@apache.org>
Committed: Tue Aug 6 18:43:37 2013 +0200
----------------------------------------------------------------------
.../services/ComponentEventImplTest.java | 39 ++++++++++++++------
.../structure/ComponentPageElementImplTest.java | 11 ++++--
2 files changed, 35 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6460e445/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
index 9eb353b..4629bb6 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
@@ -20,6 +20,7 @@ import org.apache.tapestry5.TapestryMarkers;
import org.apache.tapestry5.internal.structure.ComponentPageElementResources;
import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.apache.tapestry5.ioc.Invokable;
+import org.apache.tapestry5.model.ComponentModel;
import org.apache.tapestry5.runtime.ComponentEvent;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
@@ -55,6 +56,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
EventContext context = mockEventContext();
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -62,7 +64,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, model, logger);
assertTrue(event.matches("eventType", "someId", 0));
assertFalse(event.matches("foo", "someId", 0));
@@ -81,6 +83,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
Logger logger = mockLogger();
Object result = new Object();
ComponentPageElementResources resources = mockResources();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -88,7 +91,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, resources, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, resources, false, model, logger);
event.storeResult(result);
@@ -104,6 +107,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
EventContext context = mockEventContext();
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -111,7 +115,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, model, logger);
assertTrue(event.matches("EVENTTYPE", "someid", 0));
@@ -124,6 +128,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
EventContext context = mockEventContext();
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -131,7 +136,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, model, logger);
assertTrue(event.matches("eventType", "someId", 0));
@@ -146,6 +151,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
EventContext context = mockEventContext();
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -153,7 +159,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, model, logger);
assertTrue(event.matches("eventtype", "SOMEID", 0));
@@ -169,6 +175,8 @@ public class ComponentEventImplTest extends InternalBaseTestCase
Integer value = new Integer(27);
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
+
train_isDebugEnabled(logger, false);
train_toClass(resources, "java.lang.Integer", Integer.class);
@@ -178,7 +186,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, resources, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, resources, false, model, logger);
assertSame(event.coerceContext(0, "java.lang.Integer"), value);
@@ -192,6 +200,8 @@ public class ComponentEventImplTest extends InternalBaseTestCase
EventContext context = mockEventContext();
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
+
train_isDebugEnabled(logger, true);
logger.debug(eq(TapestryMarkers.EVENT_HANDLER_METHOD), isA(String.class));
@@ -199,7 +209,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, model, logger);
event.setMethodDescription("foo.Bar.baz()");
@@ -222,6 +232,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
EventContext context = mockEventContext();
ComponentPageElementResources resources = mockComponentPageElementResources();
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
logger.debug(eq(TapestryMarkers.EVENT_HANDLER_METHOD), isA(String.class));
@@ -234,7 +245,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, resources, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, resources, false, model, logger);
event.setMethodDescription("foo.Bar.baz()");
@@ -259,6 +270,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
Object result = new Object();
String methodDescription = "foo.Bar.baz()";
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
EasyMock.expectLastCall().atLeastOnce();
@@ -273,7 +285,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, resources, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, resources, false, model, logger);
event.setMethodDescription(methodDescription);
@@ -294,6 +306,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
Logger logger = mockLogger();
ComponentPageElementResources resources = mockResources();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
logger.debug(eq(TapestryMarkers.EVENT_HANDLER_METHOD), isA(String.class));
@@ -302,7 +315,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, resources, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, resources, false, model, logger);
event.setMethodDescription(methodDescription);
@@ -318,13 +331,14 @@ public class ComponentEventImplTest extends InternalBaseTestCase
{
ComponentEventCallback handler = mockComponentEventHandler();
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
logger.debug(eq(TapestryMarkers.EVENT_HANDLER_METHOD), isA(String.class));
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, null, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, null, false, model, logger);
event.setMethodDescription("foo.Bar.baz()");
@@ -343,6 +357,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
Logger logger = mockLogger();
ComponentPageElementResources resources = mockResources();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
EasyMock.expectLastCall().atLeastOnce();
@@ -355,7 +370,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, resources, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, resources, false, model, logger);
event.setMethodDescription("foo.Bar.baz()");
event.storeResult(result);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6460e445/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java
index 0a495e1..33cebfd 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java
@@ -3,6 +3,7 @@ package org.apache.tapestry5.internal.structure;
import static org.apache.tapestry5.SymbolConstants.COMPONENT_RENDER_TRACING_ENABLED;
import static org.apache.tapestry5.SymbolConstants.PRODUCTION_MODE;
+import org.apache.tapestry5.MetaDataConstants;
import org.apache.tapestry5.internal.services.Instantiator;
import org.apache.tapestry5.ioc.Location;
import org.apache.tapestry5.ioc.services.SymbolSource;
@@ -28,7 +29,7 @@ public class ComponentPageElementImplTest extends TestBase {
getMocksControl().resetToNice();
expect(instantiator.getModel()).andReturn(model).anyTimes();
-
+
// off by default
expect(symbolSource.valueForSymbol(PRODUCTION_MODE)).andReturn("false");
expect(symbolSource.valueForSymbol(COMPONENT_RENDER_TRACING_ENABLED)).andReturn("false");
@@ -49,6 +50,10 @@ public class ComponentPageElementImplTest extends TestBase {
expect(symbolSource.valueForSymbol(COMPONENT_RENDER_TRACING_ENABLED)).andReturn("true");
expect(request.getParameter("t:component-trace")).andReturn("false");
+ expect(page.getName()).andReturn("pageName").anyTimes();
+ expect(locator.findMeta(MetaDataConstants.UNKNOWN_ACTIVATION_CONTEXT_CHECK, "pageName", Boolean.class))
+ .andReturn(false).anyTimes();
+
replay();
ComponentPageElementImpl c; // need to create every time because of changing symbols
@@ -57,10 +62,10 @@ public class ComponentPageElementImplTest extends TestBase {
c = new ComponentPageElementImpl(page, null, "id", "nestedId", "completeid", "elementname", instantiator, location, elementResources, request, symbolSource, locator);
assertTrue(c.isRenderTracingEnabled());
-
+
c = new ComponentPageElementImpl(page, null, "id", "nestedId", "completeid", "elementname", instantiator, location, elementResources, request, symbolSource, locator);
assertTrue(c.isRenderTracingEnabled());
-
+
c = new ComponentPageElementImpl(page, null, "id", "nestedId", "completeid", "elementname", instantiator, location, elementResources, request, symbolSource, locator);
assertFalse(c.isRenderTracingEnabled());
}
[2/2] git commit: TAP5-2070 fix some tests
Posted by ml...@apache.org.
TAP5-2070 fix some tests
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/6460e445
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/6460e445
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/6460e445
Branch: refs/heads/master
Commit: 6460e445c58dc53b23f0c749b9c1cea58e093f36
Parents: 974adcc
Author: Massimo Lusetti <ml...@apache.org>
Authored: Tue Aug 6 18:43:37 2013 +0200
Committer: Massimo Lusetti <ml...@apache.org>
Committed: Tue Aug 6 18:43:37 2013 +0200
----------------------------------------------------------------------
.../services/ComponentEventImplTest.java | 39 ++++++++++++++------
.../structure/ComponentPageElementImplTest.java | 11 ++++--
2 files changed, 35 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6460e445/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
index 9eb353b..4629bb6 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
@@ -20,6 +20,7 @@ import org.apache.tapestry5.TapestryMarkers;
import org.apache.tapestry5.internal.structure.ComponentPageElementResources;
import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.apache.tapestry5.ioc.Invokable;
+import org.apache.tapestry5.model.ComponentModel;
import org.apache.tapestry5.runtime.ComponentEvent;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
@@ -55,6 +56,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
EventContext context = mockEventContext();
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -62,7 +64,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, model, logger);
assertTrue(event.matches("eventType", "someId", 0));
assertFalse(event.matches("foo", "someId", 0));
@@ -81,6 +83,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
Logger logger = mockLogger();
Object result = new Object();
ComponentPageElementResources resources = mockResources();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -88,7 +91,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, resources, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, resources, false, model, logger);
event.storeResult(result);
@@ -104,6 +107,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
EventContext context = mockEventContext();
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -111,7 +115,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, model, logger);
assertTrue(event.matches("EVENTTYPE", "someid", 0));
@@ -124,6 +128,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
EventContext context = mockEventContext();
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -131,7 +136,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, model, logger);
assertTrue(event.matches("eventType", "someId", 0));
@@ -146,6 +151,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
EventContext context = mockEventContext();
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -153,7 +159,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, model, logger);
assertTrue(event.matches("eventtype", "SOMEID", 0));
@@ -169,6 +175,8 @@ public class ComponentEventImplTest extends InternalBaseTestCase
Integer value = new Integer(27);
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
+
train_isDebugEnabled(logger, false);
train_toClass(resources, "java.lang.Integer", Integer.class);
@@ -178,7 +186,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, resources, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, resources, false, model, logger);
assertSame(event.coerceContext(0, "java.lang.Integer"), value);
@@ -192,6 +200,8 @@ public class ComponentEventImplTest extends InternalBaseTestCase
EventContext context = mockEventContext();
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
+
train_isDebugEnabled(logger, true);
logger.debug(eq(TapestryMarkers.EVENT_HANDLER_METHOD), isA(String.class));
@@ -199,7 +209,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, null, false, model, logger);
event.setMethodDescription("foo.Bar.baz()");
@@ -222,6 +232,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
EventContext context = mockEventContext();
ComponentPageElementResources resources = mockComponentPageElementResources();
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
logger.debug(eq(TapestryMarkers.EVENT_HANDLER_METHOD), isA(String.class));
@@ -234,7 +245,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, resources, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", context, handler, resources, false, model, logger);
event.setMethodDescription("foo.Bar.baz()");
@@ -259,6 +270,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
Object result = new Object();
String methodDescription = "foo.Bar.baz()";
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
EasyMock.expectLastCall().atLeastOnce();
@@ -273,7 +285,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, resources, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, resources, false, model, logger);
event.setMethodDescription(methodDescription);
@@ -294,6 +306,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
Logger logger = mockLogger();
ComponentPageElementResources resources = mockResources();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
logger.debug(eq(TapestryMarkers.EVENT_HANDLER_METHOD), isA(String.class));
@@ -302,7 +315,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, resources, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, resources, false, model, logger);
event.setMethodDescription(methodDescription);
@@ -318,13 +331,14 @@ public class ComponentEventImplTest extends InternalBaseTestCase
{
ComponentEventCallback handler = mockComponentEventHandler();
Logger logger = mockLogger();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
logger.debug(eq(TapestryMarkers.EVENT_HANDLER_METHOD), isA(String.class));
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, null, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, null, false, model, logger);
event.setMethodDescription("foo.Bar.baz()");
@@ -343,6 +357,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
Logger logger = mockLogger();
ComponentPageElementResources resources = mockResources();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
EasyMock.expectLastCall().atLeastOnce();
@@ -355,7 +370,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
replay();
- ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, resources, false, mockComponentModel(), logger);
+ ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler, resources, false, model, logger);
event.setMethodDescription("foo.Bar.baz()");
event.storeResult(result);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/6460e445/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java
index 0a495e1..33cebfd 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java
@@ -3,6 +3,7 @@ package org.apache.tapestry5.internal.structure;
import static org.apache.tapestry5.SymbolConstants.COMPONENT_RENDER_TRACING_ENABLED;
import static org.apache.tapestry5.SymbolConstants.PRODUCTION_MODE;
+import org.apache.tapestry5.MetaDataConstants;
import org.apache.tapestry5.internal.services.Instantiator;
import org.apache.tapestry5.ioc.Location;
import org.apache.tapestry5.ioc.services.SymbolSource;
@@ -28,7 +29,7 @@ public class ComponentPageElementImplTest extends TestBase {
getMocksControl().resetToNice();
expect(instantiator.getModel()).andReturn(model).anyTimes();
-
+
// off by default
expect(symbolSource.valueForSymbol(PRODUCTION_MODE)).andReturn("false");
expect(symbolSource.valueForSymbol(COMPONENT_RENDER_TRACING_ENABLED)).andReturn("false");
@@ -49,6 +50,10 @@ public class ComponentPageElementImplTest extends TestBase {
expect(symbolSource.valueForSymbol(COMPONENT_RENDER_TRACING_ENABLED)).andReturn("true");
expect(request.getParameter("t:component-trace")).andReturn("false");
+ expect(page.getName()).andReturn("pageName").anyTimes();
+ expect(locator.findMeta(MetaDataConstants.UNKNOWN_ACTIVATION_CONTEXT_CHECK, "pageName", Boolean.class))
+ .andReturn(false).anyTimes();
+
replay();
ComponentPageElementImpl c; // need to create every time because of changing symbols
@@ -57,10 +62,10 @@ public class ComponentPageElementImplTest extends TestBase {
c = new ComponentPageElementImpl(page, null, "id", "nestedId", "completeid", "elementname", instantiator, location, elementResources, request, symbolSource, locator);
assertTrue(c.isRenderTracingEnabled());
-
+
c = new ComponentPageElementImpl(page, null, "id", "nestedId", "completeid", "elementname", instantiator, location, elementResources, request, symbolSource, locator);
assertTrue(c.isRenderTracingEnabled());
-
+
c = new ComponentPageElementImpl(page, null, "id", "nestedId", "completeid", "elementname", instantiator, location, elementResources, request, symbolSource, locator);
assertFalse(c.isRenderTracingEnabled());
}