You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2007/04/21 19:20:06 UTC
svn commit: r531068 [5/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/RequestPageCacheImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RequestPageCacheImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RequestPageCacheImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RequestPageCacheImplTest.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.
@@ -19,9 +19,6 @@
import org.apache.tapestry.services.ComponentClassResolver;
import org.testng.annotations.Test;
-/**
- *
- */
public class RequestPageCacheImplTest extends InternalBaseTestCase
{
private static final String PAGE_NAME = "MyPage";
@@ -31,9 +28,9 @@
@Test
public void get_is_cached()
{
- ComponentClassResolver resolver = newComponentClassResolver();
- PagePool pool = newPagePool();
- Page page = newPage();
+ ComponentClassResolver resolver = mockComponentClassResolver();
+ PagePool pool = mockPagePool();
+ Page page = mockPage();
train_resolvePageNameToClassName(resolver, PAGE_NAME, PAGE_CLASS_NAME);
@@ -75,8 +72,8 @@
@Test
public void page_does_not_exist()
{
- ComponentClassResolver resolver = newComponentClassResolver();
- PagePool pool = newPagePool();
+ ComponentClassResolver resolver = mockComponentClassResolver();
+ PagePool pool = mockPagePool();
train_resolvePageNameToClassName(resolver, PAGE_NAME, null);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ResourceCacheImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ResourceCacheImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ResourceCacheImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ResourceCacheImplTest.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.
@@ -33,11 +33,11 @@
@Test
public void properties_for_simple_resource() throws Exception
{
- ResourceDigestGenerator generator = newResourceDigestGenerator();
+ ResourceDigestGenerator generator = mockResourceDigestGenerator();
File f = createTestFile();
URL url = f.toURL();
- Resource r = newResource();
+ Resource r = mockResource();
long lastUpdated = f.lastModified();
@@ -60,9 +60,9 @@
@Test
public void properties_for_missing_resource() throws Exception
{
- ResourceDigestGenerator generator = newResourceDigestGenerator();
+ ResourceDigestGenerator generator = mockResourceDigestGenerator();
- Resource r = newResource();
+ Resource r = mockResource();
train_getPath(r, PATH);
train_toURL(r, null);
@@ -83,11 +83,11 @@
@Test
public void properties_for_protected_resource() throws Exception
{
- ResourceDigestGenerator generator = newResourceDigestGenerator();
+ ResourceDigestGenerator generator = mockResourceDigestGenerator();
File f = createTestFile();
URL url = f.toURL();
- Resource r = newResource();
+ Resource r = mockResource();
long lastUpdated = f.lastModified();
@@ -111,11 +111,11 @@
@Test
public void caching_and_invalidation() throws Exception
{
- ResourceDigestGenerator generator = newResourceDigestGenerator();
- InvalidationListener listener = newInvalidationListener();
+ ResourceDigestGenerator generator = mockResourceDigestGenerator();
+ InvalidationListener listener = mockInvalidationListener();
File f = createTestFile();
URL url = f.toURL();
- Resource r = newResource();
+ Resource r = mockResource();
long lastUpdated = f.lastModified();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ResourceStreamerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ResourceStreamerImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ResourceStreamerImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/ResourceStreamerImplTest.java Sat Apr 21 10:19:58 2007
@@ -56,8 +56,8 @@
private void content_type(String contentType, String fileName) throws IOException
{
- Request request = newRequest();
- HttpServletResponse hsr = newHttpServletResponse();
+ Request request = mockRequest();
+ HttpServletResponse hsr = mockHttpServletResponse();
train_setContentLength(hsr, anyInt());
train_setDateHeader(hsr, eq("Last-Modified"), anyLong());
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RetainWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RetainWorkerTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RetainWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/RetainWorkerTest.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.
@@ -20,16 +20,13 @@
import org.apache.tapestry.services.ClassTransformation;
import org.testng.annotations.Test;
-/**
- *
- */
public class RetainWorkerTest extends InternalBaseTestCase
{
@Test
public void no_fields()
{
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
train_findFieldsWithAnnotation(ct, Retain.class);
@@ -45,8 +42,8 @@
@Test
public void normal()
{
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
Retain annotation = newMock(Retain.class);
train_findFieldsWithAnnotation(ct, Retain.class, "fred");
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SessionApplicationStatePersistenceStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SessionApplicationStatePersistenceStrategyTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SessionApplicationStatePersistenceStrategyTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SessionApplicationStatePersistenceStrategyTest.java Sat Apr 21 10:19:58 2007
@@ -27,11 +27,11 @@
public void get_aso_already_exists()
{
SessionHolder holder = newSessionHolder();
- Session session = newSession();
+ Session session = mockSession();
Class asoClass = ReadOnlyBean.class;
Object aso = new ReadOnlyBean();
String key = "aso:" + asoClass.getName();
- ApplicationStateCreator creator = newApplicationStateCreator();
+ ApplicationStateCreator creator = mockApplicationStateCreator();
train_getSession(holder, true, session);
train_getAttribute(session, key, aso);
@@ -75,11 +75,11 @@
public void get_aso_needs_to_be_created()
{
SessionHolder holder = newSessionHolder();
- Session session = newSession();
+ Session session = mockSession();
Class asoClass = ReadOnlyBean.class;
Object aso = new ReadOnlyBean();
String key = "aso:" + asoClass.getName();
- ApplicationStateCreator creator = newApplicationStateCreator();
+ ApplicationStateCreator creator = mockApplicationStateCreator();
// First for exists()
train_getSession(holder, false, session);
@@ -116,7 +116,7 @@
public void set_aso()
{
SessionHolder holder = newSessionHolder();
- Session session = newSession();
+ Session session = mockSession();
Class asoClass = ReadOnlyBean.class;
Object aso = new ReadOnlyBean();
String key = "aso:" + asoClass.getName();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategyTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategyTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategyTest.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,8 +28,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);
@@ -48,8 +48,8 @@
@Test
public void post_change_to_nested_component()
{
- Session session = newSession();
- Request request = newRequest();
+ Session session = mockSession();
+ Request request = mockRequest();
Object value = new Object();
train_getSession(request, true, session);
@@ -68,7 +68,7 @@
@Test
public void gather_changes_with_no_session()
{
- Request request = newRequest();
+ Request request = mockRequest();
train_getSession(request, false, null);
@@ -86,8 +86,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/StaticFilesFilterTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/StaticFilesFilterTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/StaticFilesFilterTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/StaticFilesFilterTest.java Sat Apr 21 10:19:58 2007
@@ -31,9 +31,9 @@
public void request_for_favicon() throws IOException
{
Request request = newRequest("/favicon.ico");
- Response response = newResponse();
- RequestHandler handler = newRequestHandler();
- Context context = newContext();
+ Response response = mockResponse();
+ RequestHandler handler = mockRequestHandler();
+ Context context = mockContext();
replay();
@@ -48,9 +48,9 @@
public void path_does_not_contain_a_period() throws Exception
{
Request request = newRequest("/start");
- Response response = newResponse();
- RequestHandler handler = newRequestHandler();
- Context context = newContext();
+ Response response = mockResponse();
+ RequestHandler handler = mockRequestHandler();
+ Context context = mockContext();
train_service(handler, request, response, true);
@@ -70,9 +70,9 @@
String path = "/cell.gif";
Request request = newRequest(path);
- Response response = newResponse();
- RequestHandler handler = newRequestHandler();
- Context context = newContext();
+ Response response = mockResponse();
+ RequestHandler handler = mockRequestHandler();
+ Context context = mockContext();
train_getResource(context, path, url);
@@ -91,9 +91,9 @@
String path = "/start.update";
Request request = newRequest(path);
- Response response = newResponse();
- RequestHandler handler = newRequestHandler();
- Context context = newContext();
+ Response response = mockResponse();
+ RequestHandler handler = mockRequestHandler();
+ Context context = mockContext();
train_getResource(context, path, null);
train_service(handler, request, response, true);
@@ -114,7 +114,7 @@
protected final Request newRequest(String path)
{
- Request request = newRequest();
+ Request request = mockRequest();
train_getPath(request, path);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SupportsInformalParametersWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SupportsInformalParametersWorkerTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SupportsInformalParametersWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SupportsInformalParametersWorkerTest.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.
@@ -14,7 +14,6 @@
package org.apache.tapestry.internal.services;
-
import org.apache.tapestry.annotations.SupportsInformalParameters;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.model.MutableComponentModel;
@@ -27,33 +26,33 @@
@Test
public void annotation_present()
{
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
SupportsInformalParameters annotation = newMock(SupportsInformalParameters.class);
-
+
train_getAnnotation(ct, SupportsInformalParameters.class, annotation);
model.enableSupportsInformalParameters();
-
+
replay();
-
+
new SupportsInformalParametersWorker().transform(ct, model);
-
+
verify();
}
-
+
@Test
public void annotation_missing()
{
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
-
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
+
train_getAnnotation(ct, SupportsInformalParameters.class, null);
-
+
replay();
-
+
new SupportsInformalParametersWorker().transform(ct, model);
-
+
verify();
-
+
}
}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TranslatorSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TranslatorSourceImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TranslatorSourceImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TranslatorSourceImplTest.java Sat Apr 21 10:19:58 2007
@@ -28,7 +28,7 @@
@Test
public void found_translator_by_name()
{
- Translator translator = newTranslator();
+ Translator translator = mockTranslator();
Map<String, Translator> configuration = Collections.singletonMap("mock", translator);
@@ -44,8 +44,8 @@
@Test
public void unknown_translator_is_failure()
{
- Translator fred = newTranslator();
- Translator barney = newTranslator();
+ Translator fred = mockTranslator();
+ Translator barney = mockTranslator();
Map<String, Translator> configuration = CollectionFactory.newMap();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UnclaimedFieldWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UnclaimedFieldWorkerTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UnclaimedFieldWorkerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/UnclaimedFieldWorkerTest.java Sat Apr 21 10:19:58 2007
@@ -29,8 +29,8 @@
@Test
public void no_fields()
{
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
train_findUnclaimedFields(ct);
@@ -44,8 +44,8 @@
@Test
public void normal()
{
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
train_findUnclaimedFields(ct, "_fred");
@@ -69,8 +69,8 @@
@Test
public void final_fields_are_skipped()
{
- ClassTransformation ct = newClassTransformation();
- MutableComponentModel model = newMutableComponentModel();
+ ClassTransformation ct = mockClassTransformation();
+ MutableComponentModel model = mockMutableComponentModel();
train_findUnclaimedFields(ct, "_fred");
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebRequestImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebRequestImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebRequestImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebRequestImplTest.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,7 +27,7 @@
@Test
public void get_session_doesnt_exist()
{
- HttpServletRequest sr = newHttpServletRequest();
+ HttpServletRequest sr = mockHttpServletRequest();
train_getSession(sr, false, null);
@@ -43,8 +43,8 @@
@Test
public void force_session_create()
{
- HttpServletRequest sr = newHttpServletRequest();
- HttpSession ss = newHttpSession();
+ HttpServletRequest sr = mockHttpServletRequest();
+ HttpSession ss = mockHttpSession();
train_getSession(sr, true, ss);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebSessionImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebSessionImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebSessionImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebSessionImplTest.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.
@@ -30,7 +30,7 @@
public void get_attribute_names()
{
Enumeration e = Collections.enumeration(Arrays.asList("fred", "barney"));
- HttpSession hs = newHttpSession();
+ HttpSession hs = mockHttpSession();
expect(hs.getAttributeNames()).andReturn(e);
@@ -47,7 +47,7 @@
public void get_attribute_names_by_prefix()
{
Enumeration e = Collections.enumeration(Arrays.asList("fred", "barney", "fanny"));
- HttpSession hs = newHttpSession();
+ HttpSession hs = mockHttpSession();
expect(hs.getAttributeNames()).andReturn(e);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/BlockImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/BlockImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/BlockImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/BlockImplTest.java Sat Apr 21 10:19:58 2007
@@ -25,8 +25,8 @@
public void empty_block()
{
BlockImpl block = new BlockImpl(null);
- RenderQueue queue = newRenderQueue();
- MarkupWriter writer = newMarkupWriter();
+ RenderQueue queue = mockRenderQueue();
+ MarkupWriter writer = mockMarkupWriter();
replay();
@@ -39,10 +39,10 @@
public void body_pushed_to_queue_backwards()
{
BlockImpl block = new BlockImpl(null);
- RenderQueue queue = newRenderQueue();
- MarkupWriter writer = newMarkupWriter();
- PageElement element1 = newPageElement();
- PageElement element2 = newPageElement();
+ RenderQueue queue = mockRenderQueue();
+ MarkupWriter writer = mockMarkupWriter();
+ PageElement element1 = mockPageElement();
+ PageElement element2 = mockPageElement();
getMocksControl().checkOrder(true);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ComponentPageElementImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ComponentPageElementImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ComponentPageElementImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ComponentPageElementImplTest.java Sat Apr 21 10:19:58 2007
@@ -36,7 +36,7 @@
private Page newPage(String pageName)
{
- Page page = newPage();
+ Page page = mockPage();
train_getName(page, pageName);
@@ -47,9 +47,9 @@
public void block_not_found()
{
Page page = newPage(PAGE_NAME);
- Component component = newComponent();
- ComponentModel model = newComponentModel();
- TypeCoercer coercer = newTypeCoercer();
+ Component component = mockComponent();
+ ComponentModel model = mockComponentModel();
+ TypeCoercer coercer = mockTypeCoercer();
Instantiator ins = newInstantiator(component, model);
@@ -77,10 +77,10 @@
public void block_found()
{
Page page = newPage(PAGE_NAME);
- Component component = newComponent();
- ComponentModel model = newComponentModel();
- TypeCoercer coercer = newTypeCoercer();
- Block block = newBlock();
+ Component component = mockComponent();
+ ComponentModel model = mockComponentModel();
+ TypeCoercer coercer = mockTypeCoercer();
+ Block block = mockBlock();
Instantiator ins = newInstantiator(component, model);
@@ -103,10 +103,10 @@
public void parameter_is_bound()
{
Page page = newPage(PAGE_NAME);
- Component component = newComponent();
- ComponentModel model = newComponentModel();
- Binding binding = newBinding();
- TypeCoercer coercer = newTypeCoercer();
+ Component component = mockComponent();
+ ComponentModel model = mockComponentModel();
+ Binding binding = mockBinding();
+ TypeCoercer coercer = mockTypeCoercer();
Instantiator ins = newInstantiator(component, model);
@@ -133,11 +133,11 @@
public void duplicate_block_id()
{
Page page = newPage(PAGE_NAME);
- Component component = newComponent();
- ComponentModel model = newComponentModel();
- TypeCoercer coercer = newTypeCoercer();
- Block block1 = newBlock();
- Block block2 = newBlock();
+ Component component = mockComponent();
+ ComponentModel model = mockComponentModel();
+ TypeCoercer coercer = mockTypeCoercer();
+ Block block1 = mockBlock();
+ Block block2 = mockBlock();
Instantiator ins = newInstantiator(component, model);
@@ -166,11 +166,11 @@
public void verify_required_parameters_all_are_bound()
{
Page page = newPage(PAGE_NAME);
- Component component = newComponent();
- ComponentModel model = newComponentModel();
- Binding binding = newBinding();
- TypeCoercer coercer = newTypeCoercer();
- ParameterModel pmodel = newParameterModel();
+ Component component = mockComponent();
+ ComponentModel model = mockComponentModel();
+ Binding binding = mockBinding();
+ TypeCoercer coercer = mockTypeCoercer();
+ ParameterModel pmodel = mockParameterModel();
Instantiator ins = newInstantiator(component, model);
@@ -194,10 +194,10 @@
public void verify_required_parameters_unbound_but_not_required()
{
Page page = newPage(PAGE_NAME);
- Component component = newComponent();
- ComponentModel model = newComponentModel();
- ParameterModel pmodel = newParameterModel();
- TypeCoercer coercer = newTypeCoercer();
+ Component component = mockComponent();
+ ComponentModel model = mockComponentModel();
+ ParameterModel pmodel = mockParameterModel();
+ TypeCoercer coercer = mockTypeCoercer();
Instantiator ins = newInstantiator(component, model);
@@ -219,14 +219,14 @@
@Test
public void verify_required_parameters_unbound_and_required()
{
- Page page = newPage();
- ComponentPageElement container = newComponentPageElement();
- InternalComponentResources containerResources = newInternalComponentResources();
- Component component = newComponent();
- ComponentModel model = newComponentModel();
- ParameterModel pmodel = newParameterModel();
- Location l = newLocation();
- TypeCoercer coercer = newTypeCoercer();
+ Page page = mockPage();
+ ComponentPageElement container = mockComponentPageElement();
+ InternalComponentResources containerResources = mockInternalComponentResources();
+ Component component = mockComponent();
+ ComponentModel model = mockComponentModel();
+ ParameterModel pmodel = mockParameterModel();
+ Location l = mockLocation();
+ TypeCoercer coercer = mockTypeCoercer();
Instantiator ins = newInstantiator(component, model);
@@ -275,11 +275,11 @@
public void is_invariant()
{
Page page = newPage(PAGE_NAME);
- Component component = newComponent();
- ComponentModel model = newComponentModel();
- Binding binding = newBinding();
- TypeCoercer coercer = newTypeCoercer();
- ParameterModel pmodel = newParameterModel();
+ Component component = mockComponent();
+ ComponentModel model = mockComponentModel();
+ Binding binding = mockBinding();
+ TypeCoercer coercer = mockTypeCoercer();
+ ParameterModel pmodel = mockParameterModel();
Instantiator ins = newInstantiator(component, model);
@@ -305,10 +305,10 @@
public void read_binding()
{
Page page = newPage(PAGE_NAME);
- Component component = newComponent();
- ComponentModel model = newComponentModel();
- TypeCoercer coercer = newTypeCoercer();
- Binding binding = newBinding();
+ Component component = mockComponent();
+ ComponentModel model = mockComponentModel();
+ TypeCoercer coercer = mockTypeCoercer();
+ Binding binding = mockBinding();
train_getSupportsInformalParameters(model, true);
@@ -337,10 +337,10 @@
public void write_binding()
{
Page page = newPage(PAGE_NAME);
- Component component = newComponent();
- ComponentModel model = newComponentModel();
- TypeCoercer coercer = newTypeCoercer();
- Binding binding = newBinding();
+ Component component = mockComponent();
+ ComponentModel model = mockComponentModel();
+ TypeCoercer coercer = mockTypeCoercer();
+ Binding binding = mockBinding();
Instantiator ins = newInstantiator(component, model);
@@ -369,9 +369,9 @@
public void get_embedded_does_not_exist()
{
Page page = newPage(PAGE_NAME);
- Component component = newComponent();
- ComponentModel model = newComponentModel();
- TypeCoercer coercer = newTypeCoercer();
+ Component component = mockComponent();
+ ComponentModel model = mockComponentModel();
+ TypeCoercer coercer = mockTypeCoercer();
Instantiator ins = newInstantiator(component, model);
@@ -397,11 +397,11 @@
public void get_existing_embedded_component()
{
Page page = newPage(PAGE_NAME);
- Component component = newComponent();
- ComponentModel model = newComponentModel();
- ComponentPageElement childElement = newComponentPageElement();
- Component childComponent = newComponent();
- TypeCoercer coercer = newTypeCoercer();
+ Component component = mockComponent();
+ ComponentModel model = mockComponentModel();
+ ComponentPageElement childElement = mockComponentPageElement();
+ Component childComponent = mockComponent();
+ TypeCoercer coercer = mockTypeCoercer();
Instantiator ins = newInstantiator(component, model);
@@ -427,11 +427,11 @@
public void component_ids_must_be_unique_within_container()
{
Page page = newPage(PAGE_NAME);
- Component pageComponent = newComponent();
- ComponentModel model = newComponentModel();
- ComponentPageElement child1 = newComponentPageElement();
- ComponentPageElement child2 = newComponentPageElement();
- TypeCoercer coercer = newTypeCoercer();
+ Component pageComponent = mockComponent();
+ ComponentModel model = mockComponentModel();
+ ComponentPageElement child1 = mockComponentPageElement();
+ ComponentPageElement child2 = mockComponentPageElement();
+ TypeCoercer coercer = mockTypeCoercer();
Instantiator ins = newInstantiator(pageComponent, model);
@@ -462,12 +462,12 @@
public void get_mixin_by_class_name()
{
Page page = newPage(PAGE_NAME);
- Component component = newComponent();
- ComponentModel model = newComponentModel();
- TypeCoercer coercer = newTypeCoercer();
+ Component component = mockComponent();
+ ComponentModel model = mockComponentModel();
+ TypeCoercer coercer = mockTypeCoercer();
final String mixinClassName = "foo.Bar";
- Component mixin = newComponent();
- ComponentModel mixinModel = newComponentModel();
+ Component mixin = mockComponent();
+ ComponentModel mixinModel = mockComponentModel();
Instantiator ins = newInstantiator(component, model);
Instantiator mixinIns = newInstantiator(mixin, mixinModel);
@@ -489,11 +489,11 @@
public void get_mixin_by_unknown_class_name()
{
Page page = newPage(PAGE_NAME);
- Component component = newComponent();
- ComponentModel model = newComponentModel();
- TypeCoercer coercer = newTypeCoercer();
- Component mixin = newComponent();
- ComponentModel mixinModel = newComponentModel();
+ Component component = mockComponent();
+ ComponentModel model = mockComponentModel();
+ TypeCoercer coercer = mockTypeCoercer();
+ Component mixin = mockComponent();
+ ComponentModel mixinModel = mockComponentModel();
Instantiator ins = newInstantiator(component, model);
Instantiator mixinIns = newInstantiator(mixin, mixinModel);
@@ -524,12 +524,12 @@
public void set_explicit_parameter_of_unknown_mixin()
{
Page page = newPage(PAGE_NAME);
- Component component = newComponent();
- ComponentModel model = newComponentModel();
- ComponentModel mixinModel = newComponentModel();
- Component mixin = newComponent();
- TypeCoercer coercer = newTypeCoercer();
- Binding binding = newBinding();
+ Component component = mockComponent();
+ ComponentModel model = mockComponentModel();
+ ComponentModel mixinModel = mockComponentModel();
+ Component mixin = mockComponent();
+ TypeCoercer coercer = mockTypeCoercer();
+ Binding binding = mockBinding();
Instantiator ins = newInstantiator(component, model);
Instantiator mixinInstantiator = newInstantiator(mixin, mixinModel);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/DefaultComponentParameterBindingSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/DefaultComponentParameterBindingSourceImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/DefaultComponentParameterBindingSourceImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/DefaultComponentParameterBindingSourceImplTest.java Sat Apr 21 10:19:58 2007
@@ -35,11 +35,11 @@
String id = "mycomponentid";
- ComponentResources resources = newComponentResources();
- Component container = newComponent();
+ ComponentResources resources = mockComponentResources();
+ Component container = mockComponent();
PropertyAccess access = newPropertyAccess();
ClassPropertyAdapter classPropertyAdapter = newClassPropertyAdapter();
- BindingSource bindingSource = newBindingSource();
+ BindingSource bindingSource = mockBindingSource();
train_getId(resources, id);
train_getContainer(resources, container);
@@ -64,14 +64,14 @@
String id = "mycomponentid";
- ComponentResources resources = newComponentResources();
- Component container = newComponent();
+ ComponentResources resources = mockComponentResources();
+ Component container = mockComponent();
PropertyAccess access = newPropertyAccess();
ClassPropertyAdapter classPropertyAdapter = newClassPropertyAdapter();
PropertyAdapter propertyAdapter = newPropertyAdapter();
- BindingSource bindingSource = newBindingSource();
- Binding binding = newBinding();
- ComponentResources containerResources = newComponentResources();
+ BindingSource bindingSource = mockBindingSource();
+ Binding binding = mockBinding();
+ ComponentResources containerResources = mockComponentResources();
train_getId(resources, id);
train_getContainer(resources, container);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ExpansionPageElementImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ExpansionPageElementImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ExpansionPageElementImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/ExpansionPageElementImplTest.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.
@@ -21,18 +21,15 @@
import org.apache.tapestry.runtime.RenderQueue;
import org.testng.annotations.Test;
-/**
- *
- */
public class ExpansionPageElementImplTest extends InternalBaseTestCase
{
@Test
public void invariant_binding_is_cached()
{
- Binding binding = newBinding();
- TypeCoercer coercer = newTypeCoercer();
- MarkupWriter writer = newMarkupWriter();
- RenderQueue queue = newRenderQueue();
+ Binding binding = mockBinding();
+ TypeCoercer coercer = mockTypeCoercer();
+ MarkupWriter writer = mockMarkupWriter();
+ RenderQueue queue = mockRenderQueue();
Object value = new Object();
@@ -68,10 +65,10 @@
@Test
public void variant_binding_is_not_cached()
{
- Binding binding = newBinding();
- TypeCoercer coercer = newTypeCoercer();
- MarkupWriter writer = newMarkupWriter();
- RenderQueue queue = newRenderQueue();
+ Binding binding = mockBinding();
+ TypeCoercer coercer = mockTypeCoercer();
+ MarkupWriter writer = mockMarkupWriter();
+ RenderQueue queue = mockRenderQueue();
Object value = new Object();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImplTest.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.
@@ -30,12 +30,12 @@
@Test
public void render_informal_parameters_no_bindings()
{
- ComponentPageElement element = newComponentPageElement();
- Component component = newComponent();
- Instantiator ins = newInstantiator(component);
- MarkupWriter writer = newMarkupWriter();
- TypeCoercer coercer = newTypeCoercer();
- ComponentModel model = newComponentModel();
+ ComponentPageElement element = mockComponentPageElement();
+ Component component = mockComponent();
+ Instantiator ins = mockInstantiator(component);
+ MarkupWriter writer = mockMarkupWriter();
+ TypeCoercer coercer = mockTypeCoercer();
+ ComponentModel model = mockComponentModel();
train_getModel(ins, model);
@@ -52,14 +52,14 @@
@Test
public void render_informal_parameters_skips_formal_parameters()
{
- ComponentPageElement element = newComponentPageElement();
- Component component = newComponent();
- Instantiator ins = newInstantiator(component);
- MarkupWriter writer = newMarkupWriter();
- TypeCoercer coercer = newTypeCoercer();
- ComponentModel model = newComponentModel();
- ParameterModel pmodel = newParameterModel();
- Binding binding = newBinding();
+ ComponentPageElement element = mockComponentPageElement();
+ Component component = mockComponent();
+ Instantiator ins = mockInstantiator(component);
+ MarkupWriter writer = mockMarkupWriter();
+ TypeCoercer coercer = mockTypeCoercer();
+ ComponentModel model = mockComponentModel();
+ ParameterModel pmodel = mockParameterModel();
+ Binding binding = mockBinding();
train_getModel(ins, model);
@@ -80,13 +80,13 @@
@Test
public void render_an_informal_parameter()
{
- ComponentPageElement element = newComponentPageElement();
- Component component = newComponent();
- Instantiator ins = newInstantiator(component);
- MarkupWriter writer = newMarkupWriter();
- TypeCoercer coercer = newTypeCoercer();
- ComponentModel model = newComponentModel();
- Binding binding = newBinding();
+ ComponentPageElement element = mockComponentPageElement();
+ Component component = mockComponent();
+ Instantiator ins = mockInstantiator(component);
+ MarkupWriter writer = mockMarkupWriter();
+ TypeCoercer coercer = mockTypeCoercer();
+ ComponentModel model = mockComponentModel();
+ Binding binding = mockBinding();
Object rawValue = new Object();
String convertedValue = "*converted*";
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/PageImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/PageImplTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/PageImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/structure/PageImplTest.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.
@@ -33,7 +33,7 @@
@Test
public void accessor_methods()
{
- ComponentPageElement root = newComponentPageElement();
+ ComponentPageElement root = mockComponentPageElement();
replay();
@@ -98,8 +98,8 @@
@Test
public void detach_dirty_if_listener_throws_exception()
{
- ComponentPageElement element = newComponentPageElement();
- Log log = newLog();
+ ComponentPageElement element = mockComponentPageElement();
+ Log log = mockLog();
PageLifecycleListener listener1 = newPageLifecycle();
PageLifecycleListener listener2 = newPageLifecycle();
RuntimeException t = new RuntimeException("Listener detach exception.");
@@ -183,7 +183,7 @@
@Test
public void get_by_nested_id_for_blank_value_returns_root_component()
{
- ComponentPageElement root = newComponentPageElement();
+ ComponentPageElement root = mockComponentPageElement();
replay();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.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,9 +23,6 @@
import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
-/**
- *
- */
public class MethodInvocationBuilderTest extends TapestryTestCase
{
private static final String LOCALE_CLASS_NAME = "java.util.Locale";
@@ -35,7 +32,7 @@
@Test
public void known_parameter_type()
{
- ClassTransformation transformation = newClassTransformation();
+ ClassTransformation transformation = mockClassTransformation();
replay();
@@ -54,7 +51,7 @@
@Test
public void unknown_parameter_type()
{
- ClassTransformation transformation = newClassTransformation();
+ ClassTransformation transformation = mockClassTransformation();
replay();
@@ -71,7 +68,7 @@
@Test
public void multiple_parameters_for_method()
{
- ClassTransformation transformation = newClassTransformation();
+ ClassTransformation transformation = mockClassTransformation();
replay();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/NotificationEventHandlerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/NotificationEventHandlerTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/NotificationEventHandlerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/NotificationEventHandlerTest.java Sat Apr 21 10:19:58 2007
@@ -29,7 +29,7 @@
@Test
public void true_is_allowed()
{
- Component component = newComponent();
+ Component component = mockComponent();
replay();
@@ -43,7 +43,7 @@
@Test
public void false_is_allowed()
{
- Component component = newComponent();
+ Component component = mockComponent();
replay();
@@ -57,7 +57,7 @@
@Test
public void other_values_force_exception()
{
- Component component = newComponent();
+ Component component = mockComponent();
String result = "*RESULT*";
replay();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/AliasContributionTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/AliasContributionTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/AliasContributionTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/AliasContributionTest.java Sat Apr 21 10:19:58 2007
@@ -22,7 +22,7 @@
@Test
public void default_for_mode()
{
- Runnable r = newRunnable();
+ Runnable r = mockRunnable();
replay();
@@ -38,7 +38,7 @@
@Test
public void specific_mode()
{
- Runnable r = newRunnable();
+ Runnable r = mockRunnable();
replay();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/EnumSelectModelTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/EnumSelectModelTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/EnumSelectModelTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/EnumSelectModelTest.java Sat Apr 21 10:19:58 2007
@@ -28,7 +28,7 @@
@Test
public void generated_labels()
{
- Messages messages = newMessages();
+ Messages messages = mockMessages();
stub_contains(messages, false);
replay();
@@ -49,7 +49,7 @@
@Test
public void prefixed_name_in_message_catalog()
{
- Messages messages = newMessages();
+ Messages messages = mockMessages();
stub_contains(messages, false);
train_contains(messages, "Stooge.LARRY", true);
@@ -73,7 +73,7 @@
@Test
public void unprefixed_name_in_message_catalog()
{
- Messages messages = newMessages();
+ Messages messages = mockMessages();
stub_contains(messages, false);
train_contains(messages, "MOE", true);
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MaxLengthTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MaxLengthTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MaxLengthTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MaxLengthTest.java Sat Apr 21 10:19:58 2007
@@ -25,8 +25,8 @@
@Test
public void short_enough() throws Exception
{
- Field field = newField();
- MessageFormatter formatter = newMessageFormatter();
+ Field field = mockField();
+ MessageFormatter formatter = mockMessageFormatter();
String value = "Now the student has become the master.";
replay();
@@ -42,8 +42,8 @@
public void long_value() throws Exception
{
String label = "My Field";
- Field field = newFieldWithLabel(label);
- MessageFormatter formatter = newMessageFormatter();
+ Field field = mockFieldWithLabel(label);
+ MessageFormatter formatter = mockMessageFormatter();
String value = "Now the student has become the master.";
String message = "{message}";
Integer constraint = value.length() - 1;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MaxTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MaxTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MaxTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MaxTest.java Sat Apr 21 10:19:58 2007
@@ -25,8 +25,8 @@
@Test
public void small_enough() throws Exception
{
- Field field = newField();
- MessageFormatter formatter = newMessageFormatter();
+ Field field = mockField();
+ MessageFormatter formatter = mockMessageFormatter();
Long constraint = 50l;
replay();
@@ -43,8 +43,8 @@
public void value_too_large() throws Exception
{
String label = "My Field";
- Field field = newFieldWithLabel(label);
- MessageFormatter formatter = newMessageFormatter();
+ Field field = mockFieldWithLabel(label);
+ MessageFormatter formatter = mockMessageFormatter();
String message = "{message}";
Long constraint = 100l;
Number value = 101;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MinLengthTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MinLengthTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MinLengthTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MinLengthTest.java Sat Apr 21 10:19:58 2007
@@ -26,8 +26,8 @@
@Test
public void long_enough() throws Exception
{
- Field field = newField();
- MessageFormatter formatter = newMessageFormatter();
+ Field field = mockField();
+ MessageFormatter formatter = mockMessageFormatter();
String value = "Now the student has become the master.";
replay();
@@ -43,8 +43,8 @@
public void short_value() throws Exception
{
String label = "My Field";
- Field field = newFieldWithLabel(label);
- MessageFormatter formatter = newMessageFormatter();
+ Field field = mockFieldWithLabel(label);
+ MessageFormatter formatter = mockMessageFormatter();
String value = "Now the student has become the master.";
String message = "{message}";
Integer constraint = value.length() + 1;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MinTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MinTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MinTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/MinTest.java Sat Apr 21 10:19:58 2007
@@ -25,8 +25,8 @@
@Test
public void large_enough() throws Exception
{
- Field field = newField();
- MessageFormatter formatter = newMessageFormatter();
+ Field field = mockField();
+ MessageFormatter formatter = mockMessageFormatter();
Long constraint = 50l;
replay();
@@ -43,8 +43,8 @@
public void value_too_small() throws Exception
{
String label = "My Field";
- Field field = newFieldWithLabel(label);
- MessageFormatter formatter = newMessageFormatter();
+ Field field = mockFieldWithLabel(label);
+ MessageFormatter formatter = mockMessageFormatter();
String message = "{message}";
Long constraint = 100l;
Number value = 99;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/RequiredTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/RequiredTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/RequiredTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/validator/RequiredTest.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 null_value()
{
- Field field = newFieldWithLabel("My Field");
- MessageFormatter formatter = newMessageFormatter();
+ Field field = mockFieldWithLabel("My Field");
+ MessageFormatter formatter = mockMessageFormatter();
train_format(formatter, "{message}", "My Field");
@@ -48,8 +48,8 @@
@Test
public void blank_value()
{
- MessageFormatter formatter = newMessageFormatter();
- Field field = newFieldWithLabel("My Field");
+ MessageFormatter formatter = mockMessageFormatter();
+ Field field = mockFieldWithLabel("My Field");
train_format(formatter, "{message}", "My Field");
@@ -71,8 +71,8 @@
@Test
public void non_blank_value() throws Exception
{
- MessageFormatter formatter = newMessageFormatter();
- Field field = newField();
+ MessageFormatter formatter = mockMessageFormatter();
+ Field field = mockField();
replay();
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/log4j.properties?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/log4j.properties (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/log4j.properties Sat Apr 21 10:19:58 2007
@@ -28,4 +28,5 @@
log4j.category.org.apache.tapestry.integration.app1=error
log4j.category.org.apache.tapestry.corelib=error
+log4j.category.org.apache.tapestry.integration.app1.pages.Localization=debug
Modified: tapestry/tapestry5/tapestry-hibernate/trunk/src/main/java/org/apache/tapestry/hibernate/HibernateModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-hibernate/trunk/src/main/java/org/apache/tapestry/hibernate/HibernateModule.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-hibernate/trunk/src/main/java/org/apache/tapestry/hibernate/HibernateModule.java (original)
+++ tapestry/tapestry5/tapestry-hibernate/trunk/src/main/java/org/apache/tapestry/hibernate/HibernateModule.java Sat Apr 21 10:19:58 2007
@@ -14,11 +14,12 @@
package org.apache.tapestry.hibernate;
+import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
+
import org.apache.tapestry.internal.hibernate.HibernateSessionManagerImpl;
import org.apache.tapestry.internal.hibernate.HibernateSessionSourceImpl;
import org.apache.tapestry.ioc.Configuration;
import org.apache.tapestry.ioc.ServiceBinder;
-import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.ioc.annotations.InjectService;
import org.apache.tapestry.ioc.annotations.Scope;
import org.apache.tapestry.ioc.services.PropertyShadowBuilder;
@@ -40,7 +41,6 @@
* scanned for annotated entity classes.
*/
public static void contributeHibernateSessionSource(Configuration<String> configuration,
- @Inject
ApplicationGlobals globals)
{
configuration.add(globals.getApplicationRootPackage() + ".entities");
@@ -50,12 +50,9 @@
* The session manager manages sessions on a per-thread/per-request basis. A {@link Transaction}
* is created initially, and is committed at the end of the request.
*/
- @Scope("perthread")
- public static HibernateSessionManager build(@InjectService("HibernateSessionSource")
- HibernateSessionSource sessionSource,
-
- @InjectService("ThreadCleanupHub")
- ThreadCleanupHub threadCleanupHub)
+ @Scope(PERTHREAD_SCOPE)
+ public static HibernateSessionManager build(HibernateSessionSource sessionSource,
+ ThreadCleanupHub threadCleanupHub)
{
HibernateSessionManagerImpl service = new HibernateSessionManagerImpl(sessionSource);
@@ -64,11 +61,8 @@
return service;
}
- public static Session build(@InjectService("HibernateSessionManager")
- HibernateSessionManager sessionManager,
-
- @InjectService("PropertyShadowBuilder")
- PropertyShadowBuilder propertyShadowBuilder)
+ public static Session build(HibernateSessionManager sessionManager,
+ PropertyShadowBuilder propertyShadowBuilder)
{
// Here's the thing: the tapestry.hibernate.Session class doesn't have to be per-thread,
// since
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/IOCConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/IOCConstants.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/IOCConstants.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/IOCConstants.java Sat Apr 21 10:19:58 2007
@@ -17,6 +17,8 @@
public class IOCConstants
{
public static final String DEFAULT_SCOPE = "singleton";
+
+ public static final String PERTHREAD_SCOPE = "perthread";
public static final String MODULE_BUILDER_MANIFEST_ENTRY_NAME = "Tapestry-Module-Classes";
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/annotations/Inject.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/annotations/Inject.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/annotations/Inject.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/annotations/Inject.java Sat Apr 21 10:19:58 2007
@@ -24,9 +24,11 @@
import org.apache.tapestry.ioc.ObjectProvider;
/**
- * Marker interface for a parameter whose value is determined at runtime as an injection. The value
- * will be obtained from an {@link ObjectProvider} contributed into the MasterObjectProvider service
- * implementation.
+ * Normally, resources take precedence over annotations when injecting. The Inject annotation
+ * overrides this default, forcing the resolution of the parameters value via the master
+ * {@link ObjectProvider}, even when the parameter's type matches a type that is normally a
+ * resource. This is most often used in conjunction with {@link Value} annotation when injecting a
+ * string, as normally, the String would be matched as the service id.
*/
@Target(PARAMETER)
@Retention(RUNTIME)
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/IOCInternalTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/IOCInternalTestCase.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/IOCInternalTestCase.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/IOCInternalTestCase.java Sat Apr 21 10:19:58 2007
@@ -37,25 +37,6 @@
private static ClassFactory _classFactory;
- @BeforeSuite
- public final void setup_registry()
- {
- RegistryBuilder builder = new RegistryBuilder();
-
- _registry = builder.build();
-
- _classFactory = _registry.getService(ClassFactory.class);
- }
-
- @AfterSuite
- public final void shutdown_registry()
- {
- _registry.shutdown();
-
- _registry = null;
- _classFactory = null;
- }
-
@AfterMethod
public final void cleanupThread()
{
@@ -82,54 +63,73 @@
return _registry.getService(serviceId, serviceInterface);
}
- public final void shutdown()
+ @BeforeSuite
+ public final void setup_registry()
{
- throw new UnsupportedOperationException("No registry shutdown until @AfterSuite.");
+ RegistryBuilder builder = new RegistryBuilder();
+
+ _registry = builder.build();
+
+ _classFactory = _registry.getService(ClassFactory.class);
}
- protected final void train_findDecoratorsForService(Module module, String serviceId,
- List<ServiceDecorator> decorators)
+ public final void shutdown()
{
- expect(module.findDecoratorsForService(serviceId)).andReturn(decorators);
+ throw new UnsupportedOperationException("No registry shutdown until @AfterSuite.");
}
- protected final void train_findDecoratorsForService(InternalRegistry registry)
+ @AfterSuite
+ public final void shutdown_registry()
{
- List<ServiceDecorator> result = Collections.emptyList();
+ _registry.shutdown();
- expect(registry.findDecoratorsForService(isA(ServiceDef.class))).andReturn(result);
+ _registry = null;
+ _classFactory = null;
}
- protected final InternalRegistry newInternalRegistry()
+ protected final InternalRegistry mockInternalRegistry()
{
return newMock(InternalRegistry.class);
}
- protected final void train_getLifecycle(InternalRegistry registry, String scope,
- ServiceLifecycle lifecycle)
+ protected final Module mockModule()
{
- expect(registry.getServiceLifecycle(scope)).andReturn(lifecycle);
+ return newMock(Module.class);
}
- protected final <T> void train_getService(InternalRegistry registry, String serviceId,
- Class<T> serviceInterface, T service)
+ protected final ObjectCreatorSource mockObjectCreatorSource()
{
- expect(registry.getService(serviceId, serviceInterface)).andReturn(service);
+ return newMock(ObjectCreatorSource.class);
}
- protected final Module newModule()
+ protected final void train_findDecoratorsForService(InternalRegistry registry)
{
- return newMock(Module.class);
+ List<ServiceDecorator> result = Collections.emptyList();
+
+ expect(registry.findDecoratorsForService(isA(ServiceDef.class))).andReturn(result);
}
- protected final ObjectCreatorSource newObjectCreatorSource()
+ protected final void train_findDecoratorsForService(Module module, String serviceId,
+ List<ServiceDecorator> decorators)
{
- return newMock(ObjectCreatorSource.class);
+ expect(module.findDecoratorsForService(serviceId)).andReturn(decorators);
}
protected final void train_getDescription(ObjectCreatorSource source, String description)
{
expect(source.getDescription()).andReturn(description).atLeastOnce();
+ }
+
+ protected final void train_getLifecycle(InternalRegistry registry, String scope,
+ ServiceLifecycle lifecycle)
+ {
+ expect(registry.getServiceLifecycle(scope)).andReturn(lifecycle);
+ }
+
+ protected final <T> void train_getService(InternalRegistry registry, String serviceId,
+ Class<T> serviceInterface, T service)
+ {
+ expect(registry.getService(serviceId, serviceInterface)).andReturn(service);
}
}
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImpl.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImpl.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImpl.java Sat Apr 21 10:19:58 2007
@@ -23,7 +23,6 @@
import java.util.Map;
import java.util.Set;
-import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
import org.apache.tapestry.ioc.services.ExceptionAnalysis;
@@ -37,8 +36,7 @@
private final Set<String> _throwableProperties;
- public ExceptionAnalyzerImpl(@Inject
- PropertyAccess propertyAccess)
+ public ExceptionAnalyzerImpl(PropertyAccess propertyAccess)
{
_propertyAccess = propertyAccess;
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImpl.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImpl.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImpl.java Sat Apr 21 10:19:58 2007
@@ -14,6 +14,7 @@
package org.apache.tapestry.ioc.internal.services;
+import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
import java.util.Set;
@@ -21,7 +22,7 @@
import org.apache.tapestry.ioc.annotations.Scope;
import org.apache.tapestry.ioc.services.ExceptionTracker;
-@Scope("perthread")
+@Scope(PERTHREAD_SCOPE)
public class ExceptionTrackerImpl implements ExceptionTracker
{
private final Set<Throwable> _exceptions = newSet();
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/JustInTimeObjectCreatorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/JustInTimeObjectCreatorTest.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/JustInTimeObjectCreatorTest.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/JustInTimeObjectCreatorTest.java Sat Apr 21 10:19:58 2007
@@ -25,7 +25,7 @@
@Test
public void create_after_shutdown()
{
- ObjectCreator creator = newObjectCreator();
+ ObjectCreator creator = mockObjectCreator();
replay();
@@ -49,7 +49,7 @@
@Test
public void eager_load()
{
- ObjectCreator creator = newObjectCreator();
+ ObjectCreator creator = mockObjectCreator();
Object service = new Object();
replay();
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImpl.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImpl.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImpl.java Sat Apr 21 10:19:58 2007
@@ -17,7 +17,6 @@
import java.util.List;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.ioc.annotations.InjectService;
import org.apache.tapestry.ioc.services.ClassFactory;
import org.apache.tapestry.ioc.services.DefaultImplementationBuilder;
@@ -32,7 +31,6 @@
public PipelineBuilderImpl(@InjectService("ClassFactory")
ClassFactory classFactory,
- @Inject
DefaultImplementationBuilder defaultImplementationBuilder)
{
_classFactory = classFactory;
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PropertyShadowBuilderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PropertyShadowBuilderImpl.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PropertyShadowBuilderImpl.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/PropertyShadowBuilderImpl.java Sat Apr 21 10:19:58 2007
@@ -19,7 +19,6 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
-import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.ioc.annotations.InjectService;
import org.apache.tapestry.ioc.services.ClassFab;
import org.apache.tapestry.ioc.services.ClassFactory;
@@ -37,7 +36,6 @@
public PropertyShadowBuilderImpl(@InjectService("ClassFactory")
ClassFactory classFactory,
- @Inject
PropertyAccess propertyAccess)
{
_classFactory = classFactory;
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImpl.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImpl.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImpl.java Sat Apr 21 10:19:58 2007
@@ -14,6 +14,7 @@
package org.apache.tapestry.ioc.internal.services;
+import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
import java.util.Locale;
@@ -21,7 +22,7 @@
import org.apache.tapestry.ioc.annotations.Scope;
import org.apache.tapestry.ioc.services.ThreadLocale;
-@Scope("perthread")
+@Scope(PERTHREAD_SCOPE)
public class ThreadLocaleImpl implements ThreadLocale
{
private Locale _locale = Locale.getDefault();
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/util/InternalUtils.java Sat Apr 21 10:19:58 2007
@@ -200,21 +200,20 @@
return locator.getService(serviceId, parameterType);
}
- Inject i = provider.getAnnotation(Inject.class);
+ // In the absence of @InjectService, try some autowiring. First, does the
+ // parameter type match on of the resources (the parameter defaults)?
- if (i != null) { return locator.getObject(parameterType, provider); }
+ if (provider.getAnnotation(Inject.class) == null)
+ {
+ Object result = parameterDefaults.get(parameterType);
- // See if we have any "pre-determined" parameter type to object mappings
+ if (result != null) return result;
+ }
- Object result = parameterDefaults.get(parameterType);
+ // Otherwise, make use of the MasterObjectProvider service to resolve this type (plus
+ // any other information gleaned from additional annotations) into the correct object.
- // This will return a non-null value, or throw an exception
-
- if (result == null) result = locator.getService(parameterType);
-
- // ... so the result is never null
-
- return result;
+ return locator.getObject(parameterType, provider);
}
public static Object[] calculateParametersForMethod(Method method, ServiceLocator locator,
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/SymbolSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/SymbolSource.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/SymbolSource.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/SymbolSource.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.
@@ -14,12 +14,12 @@
package org.apache.tapestry.ioc.services;
-import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.ioc.annotations.Value;
/**
* Used to manage <em>symbols</em>, configuration properties whose value is evaluated at runtime.
* Symbols use the Ant syntax: <code>${foo.bar.baz}</code> where <code>foo.bar.baz</code> is the
- * name of the symbol. The symbol may appear inside annotations such as {@link Inject}. Values for
+ * name of the symbol. The symbol may appear inside annotation, such as {@link Value}. Values for
* symbols are provided by {@link SymbolProvider}.
*/
public interface SymbolSource
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java?view=diff&rev=531068&r1=531067&r2=531068
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java Sat Apr 21 10:19:58 2007
@@ -14,6 +14,8 @@
package org.apache.tapestry.ioc.services;
+import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
+
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Arrays;
@@ -31,7 +33,6 @@
import org.apache.tapestry.ioc.ServiceLifecycle;
import org.apache.tapestry.ioc.ServiceLocator;
import org.apache.tapestry.ioc.annotations.InjectService;
-import org.apache.tapestry.ioc.annotations.Scope;
import org.apache.tapestry.ioc.annotations.Value;
import org.apache.tapestry.ioc.internal.services.ChainBuilderImpl;
import org.apache.tapestry.ioc.internal.services.DefaultImplementationBuilderImpl;
@@ -49,7 +50,6 @@
import org.apache.tapestry.ioc.internal.services.ThreadLocaleImpl;
import org.apache.tapestry.ioc.internal.services.TypeCoercerImpl;
import org.apache.tapestry.ioc.internal.services.ValueObjectProvider;
-import org.apache.tapestry.ioc.util.StrategyRegistry;
/**
* Defines the base set of services for the Tapestry IOC container.
@@ -99,13 +99,13 @@
};
}
- /** Contributes the "perthread" service lifecycle. */
+ /** Contributes the "perthread" scope. */
public void contributeServiceLifecycleSource(
MappedConfiguration<String, ServiceLifecycle> configuration,
@InjectService("ThreadCleanupHub")
ThreadCleanupHub threadCleanupHub)
{
- configuration.add("perthread", new PerThreadServiceLifecycle(threadCleanupHub,
+ configuration.add(PERTHREAD_SCOPE, new PerThreadServiceLifecycle(threadCleanupHub,
_classFactory));
}