You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jo...@apache.org on 2011/06/28 06:12:30 UTC

svn commit: r1140425 - in /tapestry/tapestry5/trunk/tapestry-core/src: main/java/org/apache/tapestry5/ main/java/org/apache/tapestry5/internal/services/ main/java/org/apache/tapestry5/services/ test/java/org/apache/tapestry5/internal/services/ test/jav...

Author: joshcanfield
Date: Tue Jun 28 04:12:30 2011
New Revision: 1140425

URL: http://svn.apache.org/viewvc?rev=1140425&view=rev
Log:
TAP5-1559 - Excessive warnings

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStrategy.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSource.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSourceImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/LinkCreationHub.java
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkSourceImplTest.java
    tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java?rev=1140425&r1=1140424&r2=1140425&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java Tue Jun 28 04:12:30 2011
@@ -169,7 +169,7 @@ public class SymbolConstants
      * If "true" (the default), then the {@link org.apache.tapestry5.services.PersistentLocale} will be encoded into the
      * {@link org.apache.tapestry5.Link} path by the {@link org.apache.tapestry5.services.ComponentEventLinkEncoder}
      * service. If overridden to "false" this does not occur, but you should provide a
-     * {@link org.apache.tapestry5.services.LinkCreationListener} (registered with the
+     * {@link org.apache.tapestry5.services.LinkCreationListener2} (registered with the
      * {@link org.apache.tapestry5.services.LinkCreationHub}) in order to add the locale as a query parameter (or
      * provide some alternate means of persisting the locale between requests).
      * 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStrategy.java?rev=1140425&r1=1140424&r2=1140425&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStrategy.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStrategy.java Tue Jun 28 04:12:30 2011
@@ -1,4 +1,4 @@
-// Copyright 2007, 2008, 2009 The Apache Software Foundation
+// Copyright 2007, 2008, 2009, 2011 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.
@@ -15,9 +15,7 @@
 package org.apache.tapestry5.internal.services;
 
 import org.apache.tapestry5.Link;
-import org.apache.tapestry5.services.LinkCreationListener;
-import org.apache.tapestry5.services.PersistentFieldChange;
-import org.apache.tapestry5.services.PersistentFieldStrategy;
+import org.apache.tapestry5.services.*;
 
 import java.util.Collection;
 
@@ -26,7 +24,7 @@ import java.util.Collection;
  * ClientPersistentFieldStorage}. This division of layer allows this service to be a true singleton, and a listener to
  * the {@link LinkSource}, and allow per-request state to be isolated inside the other service.
  */
-public class ClientPersistentFieldStrategy implements PersistentFieldStrategy, LinkCreationListener
+public class ClientPersistentFieldStrategy implements PersistentFieldStrategy, LinkCreationListener2
 {
     private final ClientPersistentFieldStorage storage;
 
@@ -45,12 +43,12 @@ public class ClientPersistentFieldStrate
         storage.postChange(pageName, componentId, fieldName, newValue);
     }
 
-    public void createdComponentEventLink(Link link)
+    public void createdComponentEventLink(Link link, ComponentEventRequestParameters parameters)
     {
         storage.updateLink(link);
     }
 
-    public void createdPageRenderLink(Link link)
+    public void createdPageRenderLink(Link link, PageRenderRequestParameters parameters)
     {
         storage.updateLink(link);
     }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSource.java?rev=1140425&r1=1140424&r2=1140425&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSource.java Tue Jun 28 04:12:30 2011
@@ -1,4 +1,4 @@
-// Copyright 2009, 2010 The Apache Software Foundation
+// Copyright 2009, 2010, 2011 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,7 +23,7 @@ import org.apache.tapestry5.services.Lin
 /**
  * A source for {@link org.apache.tapestry5.Link} objects.
  * 
- * @see org.apache.tapestry5.services.LinkCreationListener
+ * @see org.apache.tapestry5.services.LinkCreationListener2
  * @since 5.1.0.0
  */
 @UsesOrderedConfiguration(LinkCreationListener2.class)
@@ -34,7 +34,9 @@ public interface LinkSource
      * request (that is, bound to the current request's session, if any).
      * 
      * @param page
+     *            the page holding the component
      * @param nestedId
+     *            the component's qualified id (a sequence of simple ids, separated by dots).
      * @param eventType
      *            the type of event to trigger
      * @param forForm
@@ -67,7 +69,7 @@ public interface LinkSource
     Link createPageRenderLink(String pageName, boolean override, Object... pageActivationContext);
 
     /**
-     * Returns the hub, used to register and de-register {@link org.apache.tapestry5.services.LinkCreationListener}s.
+     * Returns the hub, used to register and de-register {@link org.apache.tapestry5.services.LinkCreationListener2}s.
      * 
      * @return the hub
      */

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSourceImpl.java?rev=1140425&r1=1140424&r2=1140425&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkSourceImpl.java Tue Jun 28 04:12:30 2011
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2009, 2010 The Apache Software Foundation
+// Copyright 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -136,11 +136,6 @@ public class LinkSourceImpl implements L
         addListener(TapestryInternalUtils.toLinkCreationListener2(listener));
     }
 
-    public void removeListener(LinkCreationListener listener)
-    {
-        throw new UnsupportedOperationException("Removing listeners from LinkSource is not longer supported.");
-    }
-
     public void addListener(LinkCreationListener2 listener)
     {
         assert listener != null;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/LinkCreationHub.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/LinkCreationHub.java?rev=1140425&r1=1140424&r2=1140425&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/LinkCreationHub.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/LinkCreationHub.java Tue Jun 28 04:12:30 2011
@@ -1,4 +1,4 @@
-// Copyright 2008, 2010 The Apache Software Foundation
+// Copyright 2008, 2010, 2011 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,13 +27,6 @@ public interface LinkCreationHub
     void addListener(LinkCreationListener listener);
 
     /**
-     * Removes a previously added listener.
-     * 
-     * @param listener
-     */
-    void removeListener(LinkCreationListener listener);
-
-    /**
      * Adds a listener. If the scope of the listener is per-thread, then it must be removed.
      * 
      * @param listener

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkSourceImplTest.java?rev=1140425&r1=1140424&r2=1140425&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkSourceImplTest.java Tue Jun 28 04:12:30 2011
@@ -100,7 +100,7 @@ public class LinkSourceImplTest extends 
         train_collectPageActivationContext(collector, pageName, 3);
 
         EventContext pageActivationContext = new ArrayEventContext(typeCoercer, 3);
-        PageRenderRequestParameters parameters = new PageRenderRequestParameters(pageName, pageActivationContext);
+        PageRenderRequestParameters parameters = new PageRenderRequestParameters(pageName, pageActivationContext, false);
 
         expect(linkEncoder.createPageRenderLink(parameters)).andReturn(link);
 
@@ -121,7 +121,7 @@ public class LinkSourceImplTest extends 
     private void testPageLinkCreation(String pageName, boolean overrideContext, Object... context)
     {
         PageActivationContextCollector collector = mockPageActivationContextCollector();
-        LinkCreationListener listener = mockLinkCreationListener();
+        LinkCreationListener2 listener = mockLinkCreationListener2();
         ComponentEventLinkEncoder linkEncoder = mockComponentEventLinkEncoder();
         Link link = mockLink();
         ComponentClassResolver resolver = mockComponentClassResolver();
@@ -143,7 +143,7 @@ public class LinkSourceImplTest extends 
 
         expect(linkEncoder.createPageRenderLink(parameters)).andReturn(link);
 
-        listener.createdPageRenderLink(link);
+        listener.createdPageRenderLink(link, parameters);
 
         replay();
 
@@ -204,11 +204,6 @@ public class LinkSourceImplTest extends 
         verify();
     }
 
-    private LinkCreationListener2 mockLinkCreationListener2()
-    {
-        return newMock(LinkCreationListener2.class);
-    }
-
     protected final ComponentEventLinkEncoder mockComponentEventLinkEncoder()
     {
         return newMock(ComponentEventLinkEncoder.class);
@@ -276,7 +271,7 @@ public class LinkSourceImplTest extends 
         Page primaryPage = mockPage();
         PageRenderQueue queue = mockPageRenderQueue();
         PageActivationContextCollector collector = mockPageActivationContextCollector();
-        LinkCreationListener listener = mockLinkCreationListener();
+        LinkCreationListener2 listener = mockLinkCreationListener2();
         ComponentEventLinkEncoder linkEncoder = mockComponentEventLinkEncoder();
         Link link = mockLink();
 
@@ -295,7 +290,7 @@ public class LinkSourceImplTest extends 
 
         expect(linkEncoder.createComponentEventLink(parameters, forForm)).andReturn(link);
 
-        listener.createdComponentEventLink(link);
+        listener.createdComponentEventLink(link, parameters);
 
         replay();
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java?rev=1140425&r1=1140424&r2=1140425&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java Tue Jun 28 04:12:30 2011
@@ -14,60 +14,39 @@
 
 package org.apache.tapestry5.internal.test;
 
-import static org.easymock.EasyMock.isA;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.io.Reader;
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
 import org.apache.tapestry5.ComponentResources;
 import org.apache.tapestry5.ComponentResourcesCommon;
 import org.apache.tapestry5.ContentType;
 import org.apache.tapestry5.EventContext;
 import org.apache.tapestry5.internal.InternalComponentResources;
 import org.apache.tapestry5.internal.parser.ComponentTemplate;
-import org.apache.tapestry5.internal.parser.TemplateToken;
 import org.apache.tapestry5.internal.services.*;
 import org.apache.tapestry5.internal.structure.ComponentPageElement;
 import org.apache.tapestry5.internal.structure.ComponentPageElementResources;
 import org.apache.tapestry5.internal.structure.Page;
 import org.apache.tapestry5.ioc.AnnotationProvider;
-import org.apache.tapestry5.ioc.Messages;
 import org.apache.tapestry5.ioc.Registry;
 import org.apache.tapestry5.ioc.RegistryBuilder;
 import org.apache.tapestry5.ioc.Resource;
-import org.apache.tapestry5.ioc.internal.InternalRegistry;
-import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
 import org.apache.tapestry5.ioc.services.ClassPropertyAdapter;
 import org.apache.tapestry5.ioc.services.PropertyAccess;
 import org.apache.tapestry5.ioc.services.PropertyAdapter;
 import org.apache.tapestry5.model.ComponentModel;
-import org.apache.tapestry5.model.EmbeddedComponentModel;
-import org.apache.tapestry5.model.MutableComponentModel;
 import org.apache.tapestry5.root.FieldComponent;
 import org.apache.tapestry5.runtime.Component;
 import org.apache.tapestry5.runtime.RenderCommand;
 import org.apache.tapestry5.runtime.RenderQueue;
-import org.apache.tapestry5.services.ClientBehaviorSupport;
-import org.apache.tapestry5.services.ComponentClassResolver;
-import org.apache.tapestry5.services.InvalidationListener;
-import org.apache.tapestry5.services.LinkCreationListener;
-import org.apache.tapestry5.services.LocalizationSetter;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.TapestryModule;
+import org.apache.tapestry5.services.*;
 import org.apache.tapestry5.test.TapestryTestCase;
 import org.easymock.EasyMock;
-import org.slf4j.Logger;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeSuite;
 
+import java.io.*;
+
+import static org.easymock.EasyMock.isA;
+
 /**
  * Contains additional factory and training methods related to internal interfaces.
  */
@@ -75,8 +54,6 @@ public class InternalBaseTestCase extend
 {
     private static Registry registry;
 
-    private Messages validationMessages;
-
     @BeforeSuite
     public final void setup_registry()
     {
@@ -153,27 +130,11 @@ public class InternalBaseTestCase extend
         return newMock(ComponentTemplate.class);
     }
 
-    protected final <T> void train_getService(InternalRegistry registry, String serviceId, Class<T> serviceInterface,
-            T service)
-    {
-        expect(registry.getService(serviceId, serviceInterface)).andReturn(service);
-    }
-
-    protected final ComponentInstantiatorSource mockComponentInstantiatorSource()
-    {
-        return newMock(ComponentInstantiatorSource.class);
-    }
-
     protected final Page mockPage()
     {
         return newMock(Page.class);
     }
 
-    protected final PageLoader mockPageLoader()
-    {
-        return newMock(PageLoader.class);
-    }
-
     protected RenderQueue mockRenderQueue()
     {
         return newMock(RenderQueue.class);
@@ -199,11 +160,6 @@ public class InternalBaseTestCase extend
         expect(element.getComponent()).andReturn(component).atLeastOnce();
     }
 
-    protected final void train_getId(ComponentResourcesCommon resources, String id)
-    {
-        expect(resources.getId()).andReturn(id).atLeastOnce();
-    }
-
     protected final void train_getNestedId(ComponentResourcesCommon resources, String nestedId)
     {
         expect(resources.getNestedId()).andReturn(nestedId).atLeastOnce();
@@ -220,72 +176,16 @@ public class InternalBaseTestCase extend
         expect(resolver.resolvePageClassNameToPageName(pageClassName)).andReturn(pageName);
     }
 
-    protected final void train_getContainingPage(ComponentPageElement element, Page page)
-    {
-        expect(element.getContainingPage()).andReturn(page).atLeastOnce();
-    }
-
     protected final void train_getComponentResources(ComponentPageElement element, InternalComponentResources resources)
     {
         expect(element.getComponentResources()).andReturn(resources).atLeastOnce();
     }
 
-    protected final void train_getComponentClassName(EmbeddedComponentModel model, String className)
-    {
-        expect(model.getComponentClassName()).andReturn(className).atLeastOnce();
-    }
-
     protected final RenderCommand mockRenderCommand()
     {
         return newMock(RenderCommand.class);
     }
 
-    protected final void train_getParameterNames(EmbeddedComponentModel model, String... names)
-    {
-        expect(model.getParameterNames()).andReturn(Arrays.asList(names));
-    }
-
-    protected final void train_getComponentType(EmbeddedComponentModel emodel, String componentType)
-    {
-        expect(emodel.getComponentType()).andReturn(componentType).atLeastOnce();
-    }
-
-    protected final void train_getEmbeddedComponentModel(ComponentModel model, String embeddedId,
-            EmbeddedComponentModel emodel)
-    {
-        expect(model.getEmbeddedComponentModel(embeddedId)).andReturn(emodel).atLeastOnce();
-    }
-
-    protected final EmbeddedComponentModel mockEmbeddedComponentModel()
-    {
-        return newMock(EmbeddedComponentModel.class);
-    }
-
-    protected final PageElementFactory mockPageElementFactory()
-    {
-        return newMock(PageElementFactory.class);
-    }
-
-    protected final ComponentTemplateSource mockComponentTemplateSource()
-    {
-        return newMock(ComponentTemplateSource.class);
-    }
-
-    protected final void train_getLogger(ComponentModel model, Logger logger)
-    {
-        expect(model.getLogger()).andReturn(logger).atLeastOnce();
-    }
-
-    protected final void train_getTokens(ComponentTemplate template, TemplateToken... tokens)
-    {
-        expect(template.getTokens()).andReturn(Arrays.asList(tokens));
-    }
-
-    protected final void train_getEmbeddedIds(ComponentModel model, String... ids)
-    {
-        expect(model.getEmbeddedComponentIds()).andReturn(Arrays.asList(ids));
-    }
-
     protected final void train_getComponentModel(ComponentResources resources, ComponentModel model)
     {
         expect(resources.getComponentModel()).andReturn(model).atLeastOnce();
@@ -320,16 +220,6 @@ public class InternalBaseTestCase extend
         expect(page.getRootElement()).andReturn(element).atLeastOnce();
     }
 
-    protected final void train_isMissing(ComponentTemplate template, boolean isMissing)
-    {
-        expect(template.isMissing()).andReturn(isMissing).atLeastOnce();
-    }
-
-    protected final void train_getMixinClassNames(EmbeddedComponentModel model, String... names)
-    {
-        expect(model.getMixinClassNames()).andReturn(Arrays.asList(names));
-    }
-
     protected final void train_getRootComponent(Page page, Component component)
     {
         expect(page.getRootComponent()).andReturn(component).atLeastOnce();
@@ -350,34 +240,13 @@ public class InternalBaseTestCase extend
         return newMock(InvalidationListener.class);
     }
 
-    protected final ResourceStreamer mockResourceStreamer()
-    {
-        return newMock(ResourceStreamer.class);
-    }
-
     protected final void train_get(RequestPageCache cache, String pageName, Page page)
     {
         expect(cache.get(pageName)).andReturn(page).atLeastOnce();
     }
 
-    /**
-     * Returns the default validator messages.
-     */
-    protected final Messages validationMessages()
-    {
-        if (validationMessages == null)
-        {
-            ResourceBundle bundle = ResourceBundle.getBundle("org.apache.tapestry5.internal.ValidationMessages");
-
-            validationMessages = new MessagesImpl(Locale.ENGLISH, bundle);
-        }
-
-        return validationMessages;
-    }
-
-    protected final LinkCreationListener mockLinkCreationListener()
-    {
-        return newMock(LinkCreationListener.class);
+    protected final LinkCreationListener2 mockLinkCreationListener2() {
+        return newMock(LinkCreationListener2.class);
     }
 
     protected final LinkSource mockLinkSource()
@@ -385,11 +254,6 @@ public class InternalBaseTestCase extend
         return newMock(LinkSource.class);
     }
 
-    protected final void train_isLoaded(InternalComponentResources resources, boolean isLoaded)
-    {
-        expect(resources.isLoaded()).andReturn(isLoaded);
-    }
-
     protected final void stub_isPageName(ComponentClassResolver resolver, boolean result)
     {
         expect(resolver.isPageName(isA(String.class))).andStubReturn(result);
@@ -409,7 +273,7 @@ public class InternalBaseTestCase extend
      * Reads the content of a file into a string. Each line is trimmed of line separators and
      * leading/trailing
      * whitespace.
-     * 
+     *
      * @param file
      *            trim each line of whitespace
      */
@@ -455,32 +319,6 @@ public class InternalBaseTestCase extend
         expect(page.getName()).andReturn(pageName).atLeastOnce();
     }
 
-    protected final void train_resolvePageNameToClassName(ComponentClassResolver resolver, String pageName,
-            String pageClassName)
-    {
-        expect(resolver.resolvePageNameToClassName(pageName)).andReturn(pageClassName).atLeastOnce();
-    }
-
-    protected final void train_detached(Page page, boolean dirty)
-    {
-        expect(page.detached()).andReturn(dirty);
-    }
-
-    protected void train_forName(ComponentClassCache cache, String className, Class cachedClass)
-    {
-        expect(cache.forName(className)).andReturn(cachedClass).atLeastOnce();
-    }
-
-    protected void train_forName(ComponentClassCache cache, Class cachedClass)
-    {
-        train_forName(cache, cachedClass.getName(), cachedClass);
-    }
-
-    protected final ComponentClassCache mockComponentClassCache()
-    {
-        return newMock(ComponentClassCache.class);
-    }
-
     protected void train_findContentType(PageContentTypeAnalyzer analyzer, Page page, ContentType contentType)
     {
         expect(analyzer.findContentType(page)).andReturn(contentType).atLeastOnce();
@@ -516,12 +354,6 @@ public class InternalBaseTestCase extend
         expect(resources.toClass(className)).andReturn(toClass).atLeastOnce();
     }
 
-    protected final <S, T> void train_coerce(ComponentPageElementResources componentPageElementResources, S input,
-            Class<T> expectedType, T coercedValue)
-    {
-        expect(componentPageElementResources.coerce(input, expectedType)).andReturn(coercedValue);
-    }
-
     protected final EventContext mockEventContext()
     {
         return newMock(EventContext.class);
@@ -559,14 +391,6 @@ public class InternalBaseTestCase extend
         return newMock(ClientBehaviorSupport.class);
     }
 
-    protected final MutableComponentModel mockMutableComponentModel(Logger logger)
-    {
-        MutableComponentModel model = mockMutableComponentModel();
-        train_getLogger(model, logger);
-
-        return model;
-    }
-
     protected final FieldComponent mockFieldComponent()
     {
         return newMock(FieldComponent.class);