You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2007/04/21 19:20:06 UTC
svn commit: r531068 [4/7] - in /tapestry/tapestry5:
tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/
tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/test/
tapestry-core/trunk/src/main/java/org/apache/tapestry/serv...
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/EnvironmentImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/EnvironmentImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/EnvironmentImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/EnvironmentImplTest.java Sat Apr 21 10:19:58 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -24,9 +24,6 @@
import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
-/**
- *
- */
public class EnvironmentImplTest extends TapestryTestCase
{
@Test
@@ -42,8 +39,8 @@
public void push_and_pop()
{
Environment e = new EnvironmentImpl();
- Runnable r1 = newRunnable();
- Runnable r2 = newRunnable();
+ Runnable r1 = mockRunnable();
+ Runnable r2 = mockRunnable();
replay();
@@ -65,8 +62,8 @@
public void clear()
{
Environment e = new EnvironmentImpl();
- Runnable r1 = newRunnable();
- Runnable r2 = newRunnable();
+ Runnable r1 = mockRunnable();
+ Runnable r2 = mockRunnable();
replay();
@@ -99,7 +96,7 @@
public void peek_required_when_available()
{
Environment e = new EnvironmentImpl();
- Location l = newLocation();
+ Location l = mockLocation();
replay();
@@ -114,8 +111,8 @@
public void peek_required_without_value_is_error()
{
Environment e = new EnvironmentImpl();
- Location l = newLocation();
- Component c = newComponent();
+ Location l = mockLocation();
+ Component c = mockComponent();
replay();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/EnvironmentalShadowBuilderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/EnvironmentalShadowBuilderImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/EnvironmentalShadowBuilderImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/EnvironmentalShadowBuilderImplTest.java Sat Apr 21 10:19:58 2007
@@ -29,7 +29,7 @@
{
PageRenderSupport delegate = newMock(PageRenderSupport.class);
ClassFactory factory = new ClassFactoryImpl();
- Environment env = newEnvironment();
+ Environment env = mockEnvironment();
train_peekRequired(env, PageRenderSupport.class, delegate);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldValidatorDefaultSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldValidatorDefaultSourceImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldValidatorDefaultSourceImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldValidatorDefaultSourceImplTest.java Sat Apr 21 10:19:58 2007
@@ -34,15 +34,15 @@
{
getMocksControl().checkOrder(true);
- ValidationConstraintGenerator gen = newValidationConstraintGenerator();
- FieldValidator fv1 = newFieldValidator();
- FieldValidator fv2 = newFieldValidator();
- FieldValidatorSource source = newFieldValidatorSource();
+ ValidationConstraintGenerator gen = mockValidationConstraintGenerator();
+ FieldValidator fv1 = mockFieldValidator();
+ FieldValidator fv2 = mockFieldValidator();
+ FieldValidatorSource source = mockFieldValidatorSource();
Class propertyType = Integer.class;
- AnnotationProvider provider = newAnnotationProvider();
+ AnnotationProvider provider = mockAnnotationProvider();
String overrideId = "overrideId";
- Messages overrideMessages = newMessages();
- Field field = newField();
+ Messages overrideMessages = mockMessages();
+ Field field = mockField();
Locale locale = Locale.ENGLISH;
String value = "*VALUE*";
@@ -93,14 +93,14 @@
@Test
public void validator_with_constraint() throws Exception
{
- ValidationConstraintGenerator gen = newValidationConstraintGenerator();
- FieldValidator fv = newFieldValidator();
- FieldValidatorSource source = newFieldValidatorSource();
+ ValidationConstraintGenerator gen = mockValidationConstraintGenerator();
+ FieldValidator fv = mockFieldValidator();
+ FieldValidatorSource source = mockFieldValidatorSource();
Class propertyType = Integer.class;
- AnnotationProvider provider = newAnnotationProvider();
+ AnnotationProvider provider = mockAnnotationProvider();
String overrideId = "overrideId";
- Messages overrideMessages = newMessages();
- Field field = newField();
+ Messages overrideMessages = mockMessages();
+ Field field = mockField();
Locale locale = Locale.ENGLISH;
train_buildConstraints(gen, propertyType, provider, "foo=bar");
@@ -129,13 +129,13 @@
@Test
public void no_validators_at_all() throws Exception
{
- ValidationConstraintGenerator gen = newValidationConstraintGenerator();
- FieldValidatorSource source = newFieldValidatorSource();
+ ValidationConstraintGenerator gen = mockValidationConstraintGenerator();
+ FieldValidatorSource source = mockFieldValidatorSource();
Class propertyType = Integer.class;
- AnnotationProvider provider = newAnnotationProvider();
+ AnnotationProvider provider = mockAnnotationProvider();
String overrideId = "overrideId";
- Messages overrideMessages = newMessages();
- Field field = newField();
+ Messages overrideMessages = mockMessages();
+ Field field = mockField();
Locale locale = Locale.ENGLISH;
String value = "*VALUE*";
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldValidatorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldValidatorImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldValidatorImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldValidatorImplTest.java Sat Apr 21 10:19:58 2007
@@ -30,9 +30,9 @@
@Test
public void null_value_skipped() throws Exception
{
- Field field = newField();
- MessageFormatter formatter = newMessageFormatter();
- Validator validator = newValidator();
+ Field field = mockField();
+ MessageFormatter formatter = mockMessageFormatter();
+ Validator validator = mockValidator();
train_invokeIfBlank(validator, false);
@@ -49,9 +49,9 @@
@Test
public void blank_value_skipped() throws Exception
{
- Field field = newField();
- MessageFormatter formatter = newMessageFormatter();
- Validator validator = newValidator();
+ Field field = mockField();
+ MessageFormatter formatter = mockMessageFormatter();
+ Validator validator = mockValidator();
train_invokeIfBlank(validator, false);
@@ -68,9 +68,9 @@
@Test
public void nonmatching_value_type_skipped() throws Exception
{
- Field field = newField();
- MessageFormatter formatter = newMessageFormatter();
- Validator validator = newValidator();
+ Field field = mockField();
+ MessageFormatter formatter = mockMessageFormatter();
+ Validator validator = mockValidator();
Integer value = 15;
train_invokeIfBlank(validator, true);
@@ -89,9 +89,9 @@
@Test
public void value_type_check_skipped_for_null_values() throws Exception
{
- Field field = newField();
- MessageFormatter formatter = newMessageFormatter();
- Validator validator = newValidator();
+ Field field = mockField();
+ MessageFormatter formatter = mockMessageFormatter();
+ Validator validator = mockValidator();
train_invokeIfBlank(validator, true);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldValidatorSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldValidatorSourceImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldValidatorSourceImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FieldValidatorSourceImplTest.java Sat Apr 21 10:19:58 2007
@@ -45,12 +45,12 @@
@Test
public void unknown_validator_type()
{
- ValidationMessagesSource messagesSource = newValidationMessagesSource();
- Validator validator = newValidator();
- TypeCoercer coercer = newTypeCoercer();
+ ValidationMessagesSource messagesSource = mockValidationMessagesSource();
+ Validator validator = mockValidator();
+ TypeCoercer coercer = mockTypeCoercer();
FieldComponent field = newFieldComponent();
- ComponentResources resources = newComponentResources();
- Messages containerMessages = newMessages();
+ ComponentResources resources = mockComponentResources();
+ Messages containerMessages = mockMessages();
Map<String, Validator> map = newMap();
train_getComponentResources(field, resources);
@@ -84,15 +84,15 @@
@Test
public void validator_with_no_constraint() throws Exception
{
- ValidationMessagesSource messagesSource = newValidationMessagesSource();
- Validator validator = newValidator();
- TypeCoercer coercer = newTypeCoercer();
+ ValidationMessagesSource messagesSource = mockValidationMessagesSource();
+ Validator validator = mockValidator();
+ TypeCoercer coercer = mockTypeCoercer();
FieldComponent field = newFieldComponent();
- Messages messages = newMessages();
- MessageFormatter formatter = newMessageFormatter();
+ Messages messages = mockMessages();
+ MessageFormatter formatter = mockMessageFormatter();
Object inputValue = new Object();
- ComponentResources resources = newComponentResources();
- Messages containerMessages = newMessages();
+ ComponentResources resources = mockComponentResources();
+ Messages containerMessages = mockMessages();
Map<String, Validator> map = singletonMap("required", validator);
@@ -130,14 +130,14 @@
@Test
public void component_messages_overrides_validator_messages() throws Exception
{
- ValidationMessagesSource messagesSource = newValidationMessagesSource();
- Validator validator = newValidator();
- TypeCoercer coercer = newTypeCoercer();
+ ValidationMessagesSource messagesSource = mockValidationMessagesSource();
+ Validator validator = mockValidator();
+ TypeCoercer coercer = mockTypeCoercer();
FieldComponent field = newFieldComponent();
- MessageFormatter formatter = newMessageFormatter();
+ MessageFormatter formatter = mockMessageFormatter();
Object inputValue = new Object();
- ComponentResources resources = newComponentResources();
- Messages containerMessages = newMessages();
+ ComponentResources resources = mockComponentResources();
+ Messages containerMessages = mockMessages();
Map<String, Validator> map = singletonMap("required", validator);
@@ -170,15 +170,15 @@
@Test
public void single_validator_via_specification() throws Exception
{
- ValidationMessagesSource messagesSource = newValidationMessagesSource();
- Validator validator = newValidator();
- TypeCoercer coercer = newTypeCoercer();
+ ValidationMessagesSource messagesSource = mockValidationMessagesSource();
+ Validator validator = mockValidator();
+ TypeCoercer coercer = mockTypeCoercer();
FieldComponent field = newFieldComponent();
- Messages messages = newMessages();
- MessageFormatter formatter = newMessageFormatter();
+ Messages messages = mockMessages();
+ MessageFormatter formatter = mockMessageFormatter();
Object inputValue = new Object();
- ComponentResources resources = newComponentResources();
- Messages containerMessages = newMessages();
+ ComponentResources resources = mockComponentResources();
+ Messages containerMessages = mockMessages();
Map<String, Validator> map = singletonMap("required", validator);
@@ -215,17 +215,17 @@
@Test
public void multiple_validators_via_specification() throws Exception
{
- ValidationMessagesSource messagesSource = newValidationMessagesSource();
- Validator required = newValidator();
- Validator minLength = newValidator();
- TypeCoercer coercer = newTypeCoercer();
- FieldComponent field = newFieldComponent();
- Messages messages = newMessages();
- MessageFormatter requiredFormatter = newMessageFormatter();
- MessageFormatter minLengthFormatter = newMessageFormatter();
+ ValidationMessagesSource messagesSource = mockValidationMessagesSource();
+ Validator required = mockValidator();
+ Validator minLength = mockValidator();
+ TypeCoercer coercer = mockTypeCoercer();
+ FieldComponent field = newFieldComponent();
+ Messages messages = mockMessages();
+ MessageFormatter requiredFormatter = mockMessageFormatter();
+ MessageFormatter minLengthFormatter = mockMessageFormatter();
Object inputValue = "input value";
- ComponentResources resources = newComponentResources();
- Messages containerMessages = newMessages();
+ ComponentResources resources = mockComponentResources();
+ Messages containerMessages = mockMessages();
Integer fifteen = 15;
Map<String, Validator> map = newMap();
@@ -278,15 +278,15 @@
@Test
public void validator_with_constraint() throws Exception
{
- ValidationMessagesSource messagesSource = newValidationMessagesSource();
- Validator validator = newValidator();
- TypeCoercer coercer = newTypeCoercer();
+ ValidationMessagesSource messagesSource = mockValidationMessagesSource();
+ Validator validator = mockValidator();
+ TypeCoercer coercer = mockTypeCoercer();
FieldComponent field = newFieldComponent();
- Messages messages = newMessages();
- MessageFormatter formatter = newMessageFormatter();
+ Messages messages = mockMessages();
+ MessageFormatter formatter = mockMessageFormatter();
Object inputValue = new Object();
- ComponentResources resources = newComponentResources();
- Messages containerMessages = newMessages();
+ ComponentResources resources = mockComponentResources();
+ Messages containerMessages = mockMessages();
Integer five = 5;
Map<String, Validator> map = singletonMap("minLength", validator);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FlashPersistentFieldStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FlashPersistentFieldStrategyTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FlashPersistentFieldStrategyTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/FlashPersistentFieldStrategyTest.java Sat Apr 21 10:19:58 2007
@@ -33,8 +33,8 @@
@Test
public void post_change_to_root_component()
{
- Session session = newSession();
- Request request = newRequest();
+ Session session = mockSession();
+ Request request = mockRequest();
Object value = new Object();
train_getSession(request, true, session);
@@ -53,8 +53,8 @@
@Test
public void gather_changes_with_active_session()
{
- Session session = newSession();
- Request request = newRequest();
+ Session session = mockSession();
+ Request request = mockRequest();
train_getSession(request, false, session);
train_getAttributeNames(
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/HeartbeatImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/HeartbeatImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/HeartbeatImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/HeartbeatImplTest.java Sat Apr 21 10:19:58 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@
@Test
public void single_heartbeat()
{
- Runnable r1 = newRunnable();
- Runnable r2 = newRunnable();
+ Runnable r1 = mockRunnable();
+ Runnable r2 = mockRunnable();
replay();
@@ -50,9 +50,9 @@
@Test
public void nested_heartbeats()
{
- Runnable r1 = newRunnable();
- Runnable r2 = newRunnable();
- Runnable r3 = newRunnable();
+ Runnable r1 = mockRunnable();
+ Runnable r2 = mockRunnable();
+ Runnable r3 = mockRunnable();
replay();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectBlockWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectBlockWorkerTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectBlockWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectBlockWorkerTest.java Sat Apr 21 10:19:58 2007
@@ -30,8 +30,8 @@
@Test
public void no_fields_of_type_block()
{
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
train_findFieldsOfType(ct, InjectBlockWorker.BLOCK_TYPE_NAME);
@@ -45,8 +45,8 @@
@Test
public void field_missing_annotation()
{
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
train_findFieldsOfType(ct, InjectBlockWorker.BLOCK_TYPE_NAME, "fred");
@@ -73,10 +73,10 @@
@Test
public void fields_with_annotations()
{
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
- Inject fredAnnotation = newInject();
- Inject barneyAnnotation = newInject();
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
+ Inject fredAnnotation = mockInject();
+ Inject barneyAnnotation = mockInject();
Id barneyId = newId();
String barneyFieldName = "_barneyBlock";
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectResourcesWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectResourcesWorkerTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectResourcesWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectResourcesWorkerTest.java Sat Apr 21 10:19:58 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -31,11 +31,11 @@
@Test
public void anonymous_injection()
{
- ServiceLocator locator = newServiceLocator();
+ ServiceLocator locator = mockServiceLocator();
InjectionProvider ip = newMock(InjectionProvider.class);
Inject annotation = newMock(Inject.class);
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
train_findFieldsWithAnnotation(ct, Inject.class, "myfield");
train_getFieldAnnotation(ct, "myfield", Inject.class, annotation);
@@ -58,11 +58,11 @@
@Test
public void anonymous_injection_not_provided()
{
- ServiceLocator locator = newServiceLocator();
+ ServiceLocator locator = mockServiceLocator();
InjectionProvider ip = newMock(InjectionProvider.class);
Inject annotation = newMock(Inject.class);
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
train_findFieldsWithAnnotation(ct, Inject.class, "myfield");
train_getFieldAnnotation(ct, "myfield", Inject.class, annotation);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectStandardStylesheetCommandTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectStandardStylesheetCommandTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectStandardStylesheetCommandTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectStandardStylesheetCommandTest.java Sat Apr 21 10:19:58 2007
@@ -26,8 +26,8 @@
public void no_head_element()
{
Document d = new Document();
- Environment env = newEnvironment();
- Asset asset = newAsset();
+ Environment env = mockEnvironment();
+ Asset asset = mockAsset();
d.newRootElement("foo");
String initial = d.toString();
@@ -47,14 +47,14 @@
public void head_element_found()
{
Document d = new Document();
- Environment env = newEnvironment();
- Asset asset = newAsset();
+ Environment env = mockEnvironment();
+ Asset asset = mockAsset();
d.newRootElement("html").element("head");
train_peek(env, Document.class, d);
- toClientURL(asset, "{clientURL}");
+ train_toClientURL(asset, "{clientURL}");
replay();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectWorkerTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InjectWorkerTest.java Sat Apr 21 10:19:58 2007
@@ -34,12 +34,12 @@
@Test
public void annotation_has_value()
{
- ObjectProvider provider = newObjectProvider();
- ServiceLocator locator = newServiceLocator();
+ ObjectProvider provider = mockObjectProvider();
+ ServiceLocator locator = mockServiceLocator();
Inject annotation = newMock(Inject.class);
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
- Request injected = newRequest();
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
+ Request injected = mockRequest();
train_findFieldsWithAnnotation(ct, Inject.class, "myfield");
train_getFieldAnnotation(ct, "myfield", Inject.class, annotation);
@@ -66,11 +66,11 @@
@Test
public void provide_object_fails()
{
- ObjectProvider provider = newObjectProvider();
- ServiceLocator locator = newServiceLocator();
+ ObjectProvider provider = mockObjectProvider();
+ ServiceLocator locator = mockServiceLocator();
Inject annotation = newMock(Inject.class);
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
Throwable cause = new RuntimeException("Injection failed.");
train_findFieldsWithAnnotation(ct, Inject.class, "myfield");
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java Sat Apr 21 10:19:58 2007
@@ -121,7 +121,7 @@
@Test
public void new_member_name() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -150,7 +150,7 @@
@Test
public void new_member_name_with_prefix() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -180,7 +180,7 @@
@Test
public void find_annotation_on_unknown_field() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -204,7 +204,7 @@
@Test
public void find_field_annotation() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -220,7 +220,7 @@
@Test
public void field_does_not_contain_requested_annotation() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -238,7 +238,7 @@
@Test
public void find_fields_with_annotation() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -255,7 +255,7 @@
@Test
public void find_fields_of_type() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -272,7 +272,7 @@
@Test
public void get_field_modifiers() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -285,7 +285,7 @@
@Test
public void get_field_exists() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -300,7 +300,7 @@
@Test
public void find_fields_of_type_excludes_claimed_fields() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -323,7 +323,7 @@
@Test
public void find_fields_with_annotation_excludes_claimed_files() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -341,7 +341,7 @@
@Test
public void no_fields_contain_requested_annotation() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -357,7 +357,7 @@
@Test
public void claim_fields() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -391,7 +391,7 @@
@Test
public void added_fields_are_not_listed_as_unclaimed_fields() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -409,7 +409,7 @@
@Test
public void find_class_annotations() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -440,7 +440,7 @@
// The Java runtime does honor @Inherited
assertNotNull(ChildClassInheritsAnnotation.class.getAnnotation(InheritedAnnotation.class));
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -520,11 +520,11 @@
@Test
public void add_injected_field() throws Exception
{
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
CtClass targetObjectCtClass = findCtClass(TargetObject.class);
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -552,11 +552,11 @@
{
final String value = "from the parent";
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
CtClass targetObjectCtClass = findCtClass(TargetObject.class);
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -612,7 +612,7 @@
{
CtClass ctClass = findCtClass(BasicComponent.class);
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -639,11 +639,11 @@
@Test
public void add_interface_to_class() throws Exception
{
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
CtClass targetObjectCtClass = findCtClass(TargetObject.class);
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -687,9 +687,9 @@
@Test
public void make_field_read_only() throws Exception
{
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -728,7 +728,7 @@
@Test
public void removed_fields_should_not_show_up_as_unclaimed() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -747,9 +747,9 @@
@Test
public void add_to_constructor() throws Exception
{
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -776,9 +776,9 @@
@Test
public void inject_field() throws Exception
{
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -823,9 +823,9 @@
@Test
public void override_field_read_and_write() throws Exception
{
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -911,7 +911,7 @@
@Test
public void find_methods_with_annotation() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -939,7 +939,7 @@
@Test
public void find_methods_using_filter() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -977,7 +977,7 @@
@Test
public void to_class_with_primitive_type() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -991,7 +991,7 @@
@Test
public void to_class_with_object_type() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -1005,7 +1005,7 @@
@Test
public void non_private_fields_log_an_error() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
log.error(ServicesMessages.nonPrivateFields(VisibilityBean.class.getName(), Arrays.asList(
"_$myPackagePrivate",
@@ -1039,7 +1039,7 @@
@Test
public void find_annotation_in_method() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -1060,7 +1060,7 @@
@Test
public void find_annotation_in_unknown_method() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -1084,7 +1084,7 @@
@Test
public void remove_field() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
@@ -1111,7 +1111,7 @@
@Test
public void get_method_identifier() throws Exception
{
- Log log = newLog();
+ Log log = mockLog();
replay();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java Sat Apr 21 10:19:58 2007
@@ -129,13 +129,13 @@
@Test
public void page_link()
{
- Request request = newRequest();
- Response response = newResponse();
- ComponentClassResolver resolver = newComponentClassResolver();
- Page page = newPage();
- ComponentPageElement rootElement = newComponentPageElement();
- LinkFactoryListener listener = newLinkFactoryListener();
- ComponentInvocationMap map = newComponentInvocationMap();
+ Request request = mockRequest();
+ Response response = mockResponse();
+ ComponentClassResolver resolver = mockComponentClassResolver();
+ Page page = mockPage();
+ ComponentPageElement rootElement = mockComponentPageElement();
+ LinkFactoryListener listener = mockLinkFactoryListener();
+ ComponentInvocationMap map = mockComponentInvocationMap();
train_getName(page, PAGE_CLASS_NAME);
train_resolvePageClassNameToPageName(resolver, PAGE_CLASS_NAME, PAGE_LOGICAL_NAME);
@@ -177,12 +177,12 @@
@Test
public void page_link_using_supplied_activation_context()
{
- Request request = newRequest();
- Response response = newResponse();
- ComponentClassResolver resolver = newComponentClassResolver();
- Page page = newPage();
- LinkFactoryListener listener = newLinkFactoryListener();
- ComponentInvocationMap map = newComponentInvocationMap();
+ Request request = mockRequest();
+ Response response = mockResponse();
+ ComponentClassResolver resolver = mockComponentClassResolver();
+ Page page = mockPage();
+ LinkFactoryListener listener = mockLinkFactoryListener();
+ ComponentInvocationMap map = mockComponentInvocationMap();
train_getName(page, PAGE_CLASS_NAME);
train_resolvePageClassNameToPageName(resolver, PAGE_CLASS_NAME, PAGE_LOGICAL_NAME);
@@ -222,14 +222,14 @@
@Test
public void page_link_by_name()
{
- Request request = newRequest();
- Response response = newResponse();
- ComponentClassResolver resolver = newComponentClassResolver();
- Page page = newPage();
- ComponentPageElement rootElement = newComponentPageElement();
- LinkFactoryListener listener = newLinkFactoryListener();
- ComponentInvocationMap map = newComponentInvocationMap();
- RequestPageCache cache = newRequestPageCache();
+ Request request = mockRequest();
+ Response response = mockResponse();
+ ComponentClassResolver resolver = mockComponentClassResolver();
+ Page page = mockPage();
+ ComponentPageElement rootElement = mockComponentPageElement();
+ LinkFactoryListener listener = mockLinkFactoryListener();
+ ComponentInvocationMap map = mockComponentInvocationMap();
+ RequestPageCache cache = mockRequestPageCache();
train_get(cache, PAGE_LOGICAL_NAME, page);
@@ -349,15 +349,15 @@
private void testActionLink(String pageClassName, String contextPath, String logicalPageName,
String nestedId, String eventName, String expectedURI, Object... context)
{
- Request request = newRequest();
- Response response = newResponse();
- ComponentClassResolver resolver = newComponentClassResolver();
- ComponentPageElement element = newComponentPageElement();
- Page page = newPage();
- ComponentPageElement rootElement = newComponentPageElement();
- LinkFactoryListener listener = newLinkFactoryListener();
- ComponentInvocationMap map = newComponentInvocationMap();
- RequestPageCache cache = newRequestPageCache();
+ Request request = mockRequest();
+ Response response = mockResponse();
+ ComponentClassResolver resolver = mockComponentClassResolver();
+ ComponentPageElement element = mockComponentPageElement();
+ Page page = mockPage();
+ ComponentPageElement rootElement = mockComponentPageElement();
+ LinkFactoryListener listener = mockLinkFactoryListener();
+ ComponentInvocationMap map = mockComponentInvocationMap();
+ RequestPageCache cache = mockRequestPageCache();
final Holder<Link> holder = new Holder<Link>();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LinkImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LinkImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LinkImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LinkImplTest.java Sat Apr 21 10:19:58 2007
@@ -28,7 +28,7 @@
@Test
public void url_with_parameters()
{
- Response response = newResponse();
+ Response response = mockResponse();
train_encodeURL(response, "/foo/bar?barney=rubble&fred=flintstone", ENCODED);
@@ -47,7 +47,7 @@
@Test
public void retrieve_parameter_values()
{
- Response response = newResponse();
+ Response response = mockResponse();
replay();
@@ -66,7 +66,7 @@
@Test
public void parameter_names_are_returned_sorted()
{
- Response response = newResponse();
+ Response response = mockResponse();
replay();
@@ -83,7 +83,7 @@
@Test
public void parameter_names_must_be_unique()
{
- Response response = newResponse();
+ Response response = mockResponse();
replay();
@@ -108,7 +108,7 @@
@Test
public void to_form_URI_does_not_include_parameters()
{
- Response response = newResponse();
+ Response response = mockResponse();
train_encodeURL(response, "/foo/bar", ENCODED);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LocalizationFilterTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LocalizationFilterTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LocalizationFilterTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/LocalizationFilterTest.java Sat Apr 21 10:19:58 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -29,9 +29,9 @@
@Test
public void set_locale_and_service() throws IOException
{
- RequestHandler handler = newRequestHandler();
- Request request = newRequest();
- Response response = newResponse();
+ RequestHandler handler = mockRequestHandler();
+ Request request = mockRequest();
+ Response response = mockResponse();
LocalizationSetter setter = newMock(LocalizationSetter.class);
train_getLocale(request, Locale.CANADA_FRENCH);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MarkupWriterImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MarkupWriterImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MarkupWriterImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MarkupWriterImplTest.java Sat Apr 21 10:19:58 2007
@@ -194,10 +194,10 @@
@Test
public void writer_notifies_map_about_links()
{
- ComponentInvocationMap map = newComponentInvocationMap();
+ ComponentInvocationMap map = mockComponentInvocationMap();
MarkupWriter writer = new MarkupWriterImpl(new XMLMarkupModel(), map);
- Link link = newLink();
+ Link link = mockLink();
Element e = writer.element("form");
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MetaDataLocatorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MetaDataLocatorImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MetaDataLocatorImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MetaDataLocatorImplTest.java Sat Apr 21 10:19:58 2007
@@ -31,9 +31,9 @@
@Test
public void found_in_component()
{
- ComponentResources resources = newComponentResources();
- ComponentModel model = newComponentModel();
- ComponentClassResolver resolver = newComponentClassResolver();
+ ComponentResources resources = mockComponentResources();
+ ComponentModel model = mockComponentModel();
+ ComponentClassResolver resolver = mockComponentClassResolver();
String key = "foo.bar";
String value = "zaphod";
@@ -67,11 +67,11 @@
@Test
public void found_in_container()
{
- ComponentResources resources = newComponentResources();
- ComponentResources containerResources = newComponentResources();
- ComponentModel model = newComponentModel();
- ComponentModel containerModel = newComponentModel();
- ComponentClassResolver resolver = newComponentClassResolver();
+ ComponentResources resources = mockComponentResources();
+ ComponentResources containerResources = mockComponentResources();
+ ComponentModel model = mockComponentModel();
+ ComponentModel containerModel = mockComponentModel();
+ ComponentClassResolver resolver = mockComponentClassResolver();
String key = "foo.bar";
String value = "zaphod";
@@ -98,9 +98,9 @@
@Test
public void found_via_high_level_default()
{
- ComponentResources resources = newComponentResources();
- ComponentModel model = newComponentModel();
- ComponentClassResolver resolver = newComponentClassResolver();
+ ComponentResources resources = mockComponentResources();
+ ComponentModel model = mockComponentModel();
+ ComponentClassResolver resolver = mockComponentClassResolver();
String key = "foo.bar";
String value = "zaphod";
@@ -137,9 +137,9 @@
@Test
public void default_matching_is_case_insensitive()
{
- ComponentResources resources = newComponentResources();
- ComponentModel model = newComponentModel();
- ComponentClassResolver resolver = newComponentClassResolver();
+ ComponentResources resources = mockComponentResources();
+ ComponentModel model = mockComponentModel();
+ ComponentClassResolver resolver = mockComponentClassResolver();
String key = "foo.bar";
String value = "zaphod";
@@ -176,9 +176,9 @@
@Test
public void subfolder_default_overrides_high_level_default()
{
- ComponentResources resources = newComponentResources();
- ComponentModel model = newComponentModel();
- ComponentClassResolver resolver = newComponentClassResolver();
+ ComponentResources resources = mockComponentResources();
+ ComponentModel model = mockComponentModel();
+ ComponentClassResolver resolver = mockComponentClassResolver();
String key = "foo.bar";
String value = "zaphod";
@@ -216,9 +216,9 @@
@Test
public void test_cache_cleared()
{
- ComponentResources resources = newComponentResources();
- ComponentModel model = newComponentModel();
- ComponentClassResolver resolver = newComponentClassResolver();
+ ComponentResources resources = mockComponentResources();
+ ComponentModel model = mockComponentModel();
+ ComponentClassResolver resolver = mockComponentClassResolver();
String key = "foo.bar";
String value = "zaphod";
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MetaWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MetaWorkerTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MetaWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MetaWorkerTest.java Sat Apr 21 10:19:58 2007
@@ -25,8 +25,8 @@
@Test
public void no_annotation()
{
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
train_getAnnotation(ct, Meta.class, null);
@@ -40,8 +40,8 @@
@Test
public void has_meta_data()
{
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
Meta annotation = newMock(Meta.class);
train_getAnnotation(ct, Meta.class, annotation);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MixinAfterWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MixinAfterWorkerTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MixinAfterWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MixinAfterWorkerTest.java Sat Apr 21 10:19:58 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
@Test
public void annotation_not_present()
{
- ClassTransformation transformation = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ClassTransformation transformation = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
train_getAnnotation(transformation, MixinAfter.class, null);
@@ -40,8 +40,8 @@
@Test
public void annotation_present()
{
- ClassTransformation transformation = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ClassTransformation transformation = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
MixinAfter annotation = newMock(MixinAfter.class);
train_getAnnotation(transformation, MixinAfter.class, annotation);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MixinWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MixinWorkerTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MixinWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/MixinWorkerTest.java Sat Apr 21 10:19:58 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -27,9 +27,9 @@
@Test
public void no_fields_with_mixin_annotation()
{
- ComponentClassResolver resolver = newComponentClassResolver();
- ClassTransformation transformation = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ComponentClassResolver resolver = mockComponentClassResolver();
+ ClassTransformation transformation = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
train_findFieldsWithAnnotation(transformation, Mixin.class);
@@ -43,9 +43,9 @@
@Test
public void field_with_explicit_type()
{
- ComponentClassResolver resolver = newComponentClassResolver();
- ClassTransformation transformation = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ComponentClassResolver resolver = mockComponentClassResolver();
+ ClassTransformation transformation = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
Mixin annotation = newMixin("Bar");
train_findFieldsWithAnnotation(transformation, Mixin.class, "fred");
@@ -77,9 +77,9 @@
@Test
public void field_with_no_specific_mixin_type()
{
- ComponentClassResolver resolver = newComponentClassResolver();
- ClassTransformation transformation = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ComponentClassResolver resolver = mockComponentClassResolver();
+ ClassTransformation transformation = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
Mixin annotation = newMixin("");
train_findFieldsWithAnnotation(transformation, Mixin.class, "fred");
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ObjectComponentEventResultProcessorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ObjectComponentEventResultProcessorTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ObjectComponentEventResultProcessorTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ObjectComponentEventResultProcessorTest.java Sat Apr 21 10:19:58 2007
@@ -31,8 +31,8 @@
@Test
public void invocation_is_failure()
{
- ComponentResources resources = newComponentResources();
- Component component = newComponent();
+ ComponentResources resources = mockComponentResources();
+ Component component = mockComponent();
String result = "*INVALID*";
train_getComponentResources(component, resources);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java Sat Apr 21 10:19:58 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -28,9 +28,6 @@
import org.apache.tapestry.services.ComponentClassResolver;
import org.testng.annotations.Test;
-/**
- *
- */
public class PageElementFactoryImplTest extends InternalBaseTestCase
{
private static MarkupModel _xmlModel = new XMLMarkupModel();
@@ -38,11 +35,11 @@
@Test
public void start_element()
{
- ComponentInstantiatorSource source = newComponentInstantiatorSource();
- ComponentClassResolver resolver = newComponentClassResolver();
+ ComponentInstantiatorSource source = mockComponentInstantiatorSource();
+ ComponentClassResolver resolver = mockComponentClassResolver();
MarkupWriter writer = new MarkupWriterImpl();
- Location l = newLocation();
- RenderQueue queue = newRenderQueue();
+ Location l = mockLocation();
+ RenderQueue queue = mockRenderQueue();
replay();
@@ -62,11 +59,11 @@
@Test
public void attribute()
{
- ComponentInstantiatorSource source = newComponentInstantiatorSource();
- ComponentClassResolver resolver = newComponentClassResolver();
+ ComponentInstantiatorSource source = mockComponentInstantiatorSource();
+ ComponentClassResolver resolver = mockComponentClassResolver();
MarkupWriter writer = new MarkupWriterImpl(_xmlModel, null);
- Location l = newLocation();
- RenderQueue queue = newRenderQueue();
+ Location l = mockLocation();
+ RenderQueue queue = mockRenderQueue();
replay();
@@ -88,10 +85,10 @@
@Test
public void end_element()
{
- ComponentInstantiatorSource source = newComponentInstantiatorSource();
- ComponentClassResolver resolver = newComponentClassResolver();
+ ComponentInstantiatorSource source = mockComponentInstantiatorSource();
+ ComponentClassResolver resolver = mockComponentClassResolver();
MarkupWriter writer = new MarkupWriterImpl(_xmlModel, null);
- RenderQueue queue = newRenderQueue();
+ RenderQueue queue = mockRenderQueue();
replay();
@@ -116,8 +113,8 @@
@Test
public void end_element_is_singleton()
{
- ComponentInstantiatorSource source = newComponentInstantiatorSource();
- ComponentClassResolver resolver = newComponentClassResolver();
+ ComponentInstantiatorSource source = mockComponentInstantiatorSource();
+ ComponentClassResolver resolver = mockComponentClassResolver();
replay();
@@ -134,11 +131,11 @@
@Test
public void text_element()
{
- ComponentInstantiatorSource source = newComponentInstantiatorSource();
- ComponentClassResolver resolver = newComponentClassResolver();
+ ComponentInstantiatorSource source = mockComponentInstantiatorSource();
+ ComponentClassResolver resolver = mockComponentClassResolver();
MarkupWriter writer = new MarkupWriterImpl();
- Location l = newLocation();
- RenderQueue queue = newRenderQueue();
+ Location l = mockLocation();
+ RenderQueue queue = mockRenderQueue();
replay();
@@ -159,9 +156,9 @@
@Test
public void render_body_element()
{
- ComponentInstantiatorSource source = newComponentInstantiatorSource();
- ComponentClassResolver resolver = newComponentClassResolver();
- RenderQueue queue = newRenderQueue();
+ ComponentInstantiatorSource source = mockComponentInstantiatorSource();
+ ComponentClassResolver resolver = mockComponentClassResolver();
+ RenderQueue queue = mockRenderQueue();
ComponentPageElement component = newMock(ComponentPageElement.class);
MarkupWriter writer = newMock(MarkupWriter.class);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageLoaderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageLoaderImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageLoaderImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageLoaderImplTest.java Sat Apr 21 10:19:58 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -42,14 +42,14 @@
@Test
public void not_all_embedded_components_in_template()
{
- ComponentTemplateSource templateSource = newComponentTemplateSource();
- PageElementFactory elementFactory = newPageElementFactory();
- BindingSource bindingSource = newBindingSource();
- ComponentPageElement rootElement = newComponentPageElement();
- InternalComponentResources resources = newInternalComponentResources();
- ComponentModel model = newComponentModel();
- ComponentTemplate template = newComponentTemplate();
- Log log = newLog();
+ ComponentTemplateSource templateSource = mockComponentTemplateSource();
+ PageElementFactory elementFactory = mockPageElementFactory();
+ BindingSource bindingSource = mockBindingSource();
+ ComponentPageElement rootElement = mockComponentPageElement();
+ InternalComponentResources resources = mockInternalComponentResources();
+ ComponentModel model = mockComponentModel();
+ ComponentTemplate template = mockComponentTemplate();
+ Log log = mockLog();
train_newRootComponentElement(elementFactory, PAGE_CLASS_NAME, rootElement);
@@ -87,21 +87,21 @@
@Test
public void type_conflict_between_template_and_class()
{
- ComponentTemplateSource templateSource = newComponentTemplateSource();
- PageElementFactory elementFactory = newPageElementFactory();
- BindingSource bindingSource = newBindingSource();
- ComponentPageElement rootElement = newComponentPageElement();
- InternalComponentResources resources = newInternalComponentResources();
- ComponentModel model = newComponentModel();
- ComponentModel childModel = newComponentModel();
- ComponentTemplate template = newComponentTemplate();
- Log log = newLog();
- EmbeddedComponentModel emodel = newEmbeddedComponentModel();
- ComponentPageElement childElement = newComponentPageElement();
- InternalComponentResources childResources = newInternalComponentResources();
- Location l = newLocation();
- PageElement body = newPageElement();
- ComponentTemplate childTemplate = newComponentTemplate();
+ ComponentTemplateSource templateSource = mockComponentTemplateSource();
+ PageElementFactory elementFactory = mockPageElementFactory();
+ BindingSource bindingSource = mockBindingSource();
+ ComponentPageElement rootElement = mockComponentPageElement();
+ InternalComponentResources resources = mockInternalComponentResources();
+ ComponentModel model = mockComponentModel();
+ ComponentModel childModel = mockComponentModel();
+ ComponentTemplate template = mockComponentTemplate();
+ Log log = mockLog();
+ EmbeddedComponentModel emodel = mockEmbeddedComponentModel();
+ ComponentPageElement childElement = mockComponentPageElement();
+ InternalComponentResources childResources = mockInternalComponentResources();
+ Location l = mockLocation();
+ PageElement body = mockPageElement();
+ ComponentTemplate childTemplate = mockComponentTemplate();
train_newRootComponentElement(elementFactory, PAGE_CLASS_NAME, rootElement);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java Sat Apr 21 10:19:58 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -26,9 +26,6 @@
import org.apache.tapestry.ioc.services.ThreadLocale;
import org.testng.annotations.Test;
-/**
- *
- */
public class PagePoolImplTest extends InternalBaseTestCase
{
private static final String PAGE_NAME = "com.foo.pages.MyPage";
@@ -40,9 +37,9 @@
@Test
public void checkout_when_page_list_is_null()
{
- PageLoader loader = newPageLoader();
- Page page = newPage();
- ThreadLocale tl = newThreadLocale();
+ PageLoader loader = mockPageLoader();
+ Page page = mockPage();
+ ThreadLocale tl = mockThreadLocale();
train_getLocale(tl, _locale);
@@ -132,9 +129,9 @@
@Test
public void dirty_pages_are_not_pooled()
{
- PageLoader loader = newPageLoader();
- Page page = newPage();
- Log log = newLog();
+ PageLoader loader = mockPageLoader();
+ Page page = mockPage();
+ Log log = mockLog();
train_detached(page, true);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java Sat Apr 21 10:19:58 2007
@@ -35,12 +35,12 @@
@Test
public void not_a_page_request() throws Exception
{
- ComponentClassResolver resolver = newComponentClassResolver();
- PageResponseRenderer renderer = newPageResponseRenderer();
- RequestPageCache cache = newRequestPageCache();
+ ComponentClassResolver resolver = mockComponentClassResolver();
+ PageResponseRenderer renderer = mockPageResponseRenderer();
+ RequestPageCache cache = mockRequestPageCache();
PageLinkHandler handler = new PageLinkHandlerImpl(cache, null);
- Request request = newRequest();
- Response response = newResponse();
+ Request request = mockRequest();
+ Response response = mockResponse();
stub_isPageName(resolver, false);
@@ -59,11 +59,11 @@
@Test
public void empty_path() throws Exception
{
- ComponentClassResolver resolver = newComponentClassResolver();
- PageResponseRenderer renderer = newPageResponseRenderer();
+ ComponentClassResolver resolver = mockComponentClassResolver();
+ PageResponseRenderer renderer = mockPageResponseRenderer();
PageLinkHandler handler = newMock(PageLinkHandler.class);
- Request request = newRequest();
- Response response = newResponse();
+ Request request = mockRequest();
+ Response response = mockResponse();
train_getPath(request, "");
@@ -90,14 +90,14 @@
private void no_extra_context(boolean finalSlash) throws Exception
{
- ComponentClassResolver resolver = newComponentClassResolver();
- PageResponseRenderer renderer = newPageResponseRenderer();
- RequestPageCache cache = newRequestPageCache();
+ ComponentClassResolver resolver = mockComponentClassResolver();
+ PageResponseRenderer renderer = mockPageResponseRenderer();
+ RequestPageCache cache = mockRequestPageCache();
ComponentEventResultProcessor processor = newComponentEventResultProcessor();
- Request request = newRequest();
- Response response = newResponse();
- Page page = newPage();
- ComponentPageElement rootElement = newComponentPageElement();
+ Request request = mockRequest();
+ Response response = mockResponse();
+ Page page = mockPage();
+ ComponentPageElement rootElement = mockComponentPageElement();
String path = "/foo/Bar" + (finalSlash ? "/" : "");
train_getPath(request, path);
@@ -143,13 +143,13 @@
private void context_passed_in_path(boolean finalSlash) throws Exception
{
ComponentEventResultProcessor processor = newComponentEventResultProcessor();
- ComponentClassResolver resolver = newComponentClassResolver();
- PageResponseRenderer renderer = newPageResponseRenderer();
- RequestPageCache cache = newRequestPageCache();
- Request request = newRequest();
- Response response = newResponse();
- Page page = newPage();
- ComponentPageElement rootElement = newComponentPageElement();
+ ComponentClassResolver resolver = mockComponentClassResolver();
+ PageResponseRenderer renderer = mockPageResponseRenderer();
+ RequestPageCache cache = mockRequestPageCache();
+ Request request = mockRequest();
+ Response response = mockResponse();
+ Page page = mockPage();
+ ComponentPageElement rootElement = mockComponentPageElement();
String path = "/foo/Bar/zip/zoom" + (finalSlash ? "/" : "");
train_getPath(request, path);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageRenderSupportImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageRenderSupportImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageRenderSupportImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageRenderSupportImplTest.java Sat Apr 21 10:19:58 2007
@@ -28,8 +28,8 @@
@Test
public void add_script_link_by_asset()
{
- DocumentScriptBuilder builder = newDocumentScriptBuilder();
- Asset asset = newAsset();
+ DocumentScriptBuilder builder = mockDocumentScriptBuilder();
+ Asset asset = mockAsset();
train_toClientURL(asset, ASSET_URL);
builder.addScriptLink(ASSET_URL);
@@ -46,7 +46,7 @@
@Test
public void add_script()
{
- DocumentScriptBuilder builder = newDocumentScriptBuilder();
+ DocumentScriptBuilder builder = mockDocumentScriptBuilder();
builder.addScript("Tapestry.Foo(\"bar\");");
@@ -65,10 +65,10 @@
String path = "${root}/foo/bar.pdf";
String expanded = "org/apache/tapestry/foo/bar.pdf";
- DocumentScriptBuilder builder = newDocumentScriptBuilder();
- Asset asset = newAsset();
- SymbolSource source = newSymbolSource();
- AssetSource assetSource = newAssetSource();
+ DocumentScriptBuilder builder = mockDocumentScriptBuilder();
+ Asset asset = mockAsset();
+ SymbolSource source = mockSymbolSource();
+ AssetSource assetSource = mockAssetSource();
train_expandSymbols(source, path, expanded);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageTemplateLocatorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageTemplateLocatorImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageTemplateLocatorImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PageTemplateLocatorImplTest.java Sat Apr 21 10:19:58 2007
@@ -27,9 +27,9 @@
@Test
public void not_a_page_class()
{
- ComponentModel model = newComponentModel();
- Resource root = newResource();
- ComponentClassResolver resolver = newComponentClassResolver();
+ ComponentModel model = mockComponentModel();
+ Resource root = mockResource();
+ ComponentClassResolver resolver = mockComponentClassResolver();
train_getComponentClassName(model, "foo.bar.Baz");
@@ -45,14 +45,14 @@
@Test
public void template_found()
{
- ComponentModel model = newComponentModel();
- Resource root = newResource();
- Resource withExtension = newResource();
- Resource forLocale = newResource();
+ ComponentModel model = mockComponentModel();
+ Resource root = mockResource();
+ Resource withExtension = mockResource();
+ Resource forLocale = mockResource();
Locale locale = Locale.FRENCH;
String className = "myapp.pages.Foo";
- ComponentClassResolver resolver = newComponentClassResolver();
+ ComponentClassResolver resolver = mockComponentClassResolver();
train_getComponentClassName(model, className);
@@ -73,13 +73,13 @@
@Test
public void template_not_found()
{
- ComponentModel model = newComponentModel();
- Resource root = newResource();
- Resource withExtension = newResource();
+ ComponentModel model = mockComponentModel();
+ Resource root = mockResource();
+ Resource withExtension = mockResource();
Locale locale = Locale.GERMAN;
String className = "myapp.pages.bar.Baz";
- ComponentClassResolver resolver = newComponentClassResolver();
+ ComponentClassResolver resolver = mockComponentClassResolver();
train_getComponentClassName(model, className);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterWorkerTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ParameterWorkerTest.java Sat Apr 21 10:19:58 2007
@@ -58,7 +58,7 @@
@Test
public void page_load_behavior() throws Exception
{
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
assertNotNull(setupForIntegrationTest(resources));
}
@@ -66,7 +66,7 @@
@Test
public void invariant_object_retained_after_detach() throws Exception
{
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
Component component = setupForIntegrationTest(resources);
@@ -110,7 +110,7 @@
@Test
public void invariant_primitive_retained_after_detach() throws Exception
{
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
Component component = setupForIntegrationTest(resources);
@@ -160,7 +160,7 @@
@Test
public void changes_before_load_become_defaults_and_dont_update_bindings() throws Exception
{
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
Component component = setupForIntegrationTest(resources);
@@ -227,7 +227,7 @@
@Test
public void cached_object_read() throws Exception
{
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
Component component = setupForIntegrationTest(resources);
@@ -289,7 +289,7 @@
@Test
public void cached_object_write() throws Exception
{
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
Component component = setupForIntegrationTest(resources);
@@ -343,7 +343,7 @@
@Test
public void cached_primitive_write() throws Exception
{
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
Component component = setupForIntegrationTest(resources);
@@ -398,7 +398,7 @@
@Test
public void uncached_object_read() throws Exception
{
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
Component component = setupForIntegrationTest(resources);
@@ -430,7 +430,7 @@
@Test
public void uncached_object_write() throws Exception
{
- InternalComponentResources resources = newInternalComponentResources();
+ InternalComponentResources resources = mockInternalComponentResources();
Component component = setupForIntegrationTest(resources);
@@ -457,12 +457,12 @@
@Test
public void parameter_with_default() throws Exception
{
- final BindingSource source = newBindingSource();
- final InternalComponentResources resources = newInternalComponentResources();
- final Binding binding = newBinding();
+ final BindingSource source = mockBindingSource();
+ final InternalComponentResources resources = mockInternalComponentResources();
+ final Binding binding = mockBinding();
String boundValue = "howdy!";
- MutableComponentModel model = newMutableComponentModel();
+ MutableComponentModel model = mockMutableComponentModel();
model.addParameter("value", false, TapestryConstants.PROP_BINDING_PREFIX);
@@ -488,7 +488,7 @@
Component component = setupForIntegrationTest(
resources,
- newLog(),
+ mockLog(),
DefaultParameterComponent.class.getName(),
model,
source,
@@ -508,12 +508,12 @@
@Test
public void default_binding_method() throws Exception
{
- BindingSource source = newBindingSource();
- final InternalComponentResources resources = newInternalComponentResources();
- _binding = newBinding();
+ BindingSource source = mockBindingSource();
+ final InternalComponentResources resources = mockInternalComponentResources();
+ _binding = mockBinding();
String boundValue = "yowza!";
- MutableComponentModel model = newMutableComponentModel();
+ MutableComponentModel model = mockMutableComponentModel();
model.addParameter("value", false, TapestryConstants.PROP_BINDING_PREFIX);
@@ -533,7 +533,7 @@
Component component = setupForIntegrationTest(
resources,
- newLog(),
+ mockLog(),
DefaultParameterBindingMethodComponent.class.getName(),
model,
source,
@@ -565,7 +565,7 @@
private Component setupForIntegrationTest(final InternalComponentResources resources)
throws Exception
{
- MutableComponentModel model = newMutableComponentModel();
+ MutableComponentModel model = mockMutableComponentModel();
model.addParameter("invariantObject", false, TapestryConstants.PROP_BINDING_PREFIX);
model.addParameter("invariantPrimitive", false, TapestryConstants.PROP_BINDING_PREFIX);
@@ -583,10 +583,10 @@
return setupForIntegrationTest(
resources,
- newLog(),
+ mockLog(),
ParameterComponent.class.getName(),
model,
- newBindingSource(),
+ mockBindingSource(),
phaseTwoTraining);
}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PersistentFieldManagerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PersistentFieldManagerImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PersistentFieldManagerImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/PersistentFieldManagerImplTest.java Sat Apr 21 10:19:58 2007
@@ -39,8 +39,8 @@
PersistentFieldStrategy strat1 = newPersistentFieldStrategy();
PersistentFieldStrategy strat2 = newPersistentFieldStrategy();
- ComponentResources resources = newComponentResources();
- ComponentModel model = newComponentModel();
+ ComponentResources resources = mockComponentResources();
+ ComponentModel model = mockComponentModel();
Map<String, PersistentFieldStrategy> strategies = newMap();
strategies.put("foo", strat1);
@@ -77,8 +77,8 @@
String fieldName = "field";
String strategyName = "foo";
- ComponentResources resources = newComponentResources();
- ComponentModel model = newComponentModel();
+ ComponentResources resources = mockComponentResources();
+ ComponentModel model = mockComponentModel();
PersistentFieldStrategy strat = newPersistentFieldStrategy();
Object value = new Object();
@@ -109,8 +109,8 @@
String fieldName = "field";
String strategyName = "FOO";
- ComponentResources resources = newComponentResources();
- ComponentModel model = newComponentModel();
+ ComponentResources resources = mockComponentResources();
+ ComponentModel model = mockComponentModel();
PersistentFieldStrategy strat = newPersistentFieldStrategy();
Object value = new Object();
@@ -142,8 +142,8 @@
String fieldName = "field";
String strategyName = "foo";
- ComponentResources resources = newComponentResources();
- ComponentModel model = newComponentModel();
+ ComponentResources resources = mockComponentResources();
+ ComponentModel model = mockComponentModel();
PersistentFieldStrategy strat = newPersistentFieldStrategy();
MetaDataLocator locator = newMetaDataLocator();
@@ -178,8 +178,8 @@
String nestedId = "nested";
String fieldName = "field";
- ComponentResources resources = newComponentResources();
- ComponentModel model = newComponentModel();
+ ComponentResources resources = mockComponentResources();
+ ComponentModel model = mockComponentModel();
MetaDataLocator locator = newMetaDataLocator();
PersistentFieldStrategy strat = newPersistentFieldStrategy();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RenderQueueImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RenderQueueImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RenderQueueImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RenderQueueImplTest.java Sat Apr 21 10:19:58 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -35,8 +35,8 @@
}
};
- Log log = newLog();
- MarkupWriter writer = newMarkupWriter();
+ Log log = mockLog();
+ MarkupWriter writer = mockMarkupWriter();
RenderQueueImpl queue = new RenderQueueImpl(log);
expect(log.isDebugEnabled()).andReturn(false).atLeastOnce();
@@ -71,8 +71,8 @@
}
};
- Log log = newLog();
- MarkupWriter writer = newMarkupWriter();
+ Log log = mockLog();
+ MarkupWriter writer = mockMarkupWriter();
expect(log.isDebugEnabled()).andReturn(false).atLeastOnce();