tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject svn commit: r594319 [29/40] - in /tapestry/tapestry5/trunk: ./ tapestry-annotations/ tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/ tapestry-annotations/src/site/ tapestry-component-report/ tapestry-component-report/src/main/java/or...
Date Mon, 12 Nov 2007 22:23:28 GMT
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentClassResolverImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentClassResolverImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentClassResolverImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentClassResolverImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,18 +14,17 @@
 
 package org.apache.tapestry.internal.services;
 
+import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry.services.ComponentClassResolver;
+import org.apache.tapestry.services.LibraryMapping;
 import static org.easymock.EasyMock.isA;
+import org.testng.annotations.Test;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.ComponentClassResolver;
-import org.apache.tapestry.services.LibraryMapping;
-import org.testng.annotations.Test;
-
 public class ComponentClassResolverImplTest extends InternalBaseTestCase
 {
     private static final String APP_ROOT_PACKAGE = "org.example.app";
@@ -39,7 +38,7 @@
     private static final String LIB_ROOT_PACKAGE = "org.example.lib";
 
     private ComponentClassResolverImpl create(ComponentInstantiatorSource source,
-            ClassNameLocator locator, LibraryMapping... mappings)
+                                              ClassNameLocator locator, LibraryMapping... mappings)
     {
         List<LibraryMapping> list = Arrays.asList(mappings);
 
@@ -191,7 +190,7 @@
         replay();
 
         ComponentClassResolver resolver = create(source, locator, new LibraryMapping(CORE_PREFIX,
-                CORE_ROOT_PACKAGE));
+                                                                                     CORE_ROOT_PACKAGE));
 
         try
         {
@@ -247,7 +246,7 @@
         replay();
 
         ComponentClassResolver resolver = create(source, locator, new LibraryMapping(CORE_PREFIX,
-                CORE_ROOT_PACKAGE));
+                                                                                     CORE_ROOT_PACKAGE));
 
         // Can look like an application page, but still resolves to the core library class name.
 
@@ -279,7 +278,7 @@
     }
 
     protected final void train_locateComponentClassNames(ClassNameLocator locator,
-            String packageName, String... classNames)
+                                                         String packageName, String... classNames)
     {
         expect(locator.locateClassNames(packageName)).andReturn(Arrays.asList(classNames));
     }
@@ -305,7 +304,9 @@
         verify();
     }
 
-    /** All of the caches are handled identically, so we just test the pages for caching. */
+    /**
+     * All of the caches are handled identically, so we just test the pages for caching.
+     */
     @Test
     public void resolved_page_names_are_cached()
     {
@@ -365,7 +366,7 @@
         replay();
 
         ComponentClassResolver resolver = create(source, locator, new LibraryMapping(CORE_PREFIX,
-                CORE_ROOT_PACKAGE));
+                                                                                     CORE_ROOT_PACKAGE));
 
         assertEquals(resolver.resolvePageNameToClassName("CorePage"), className);
 
@@ -388,7 +389,7 @@
         replay();
 
         ComponentClassResolver resolver = create(source, locator, new LibraryMapping(CORE_PREFIX,
-                CORE_ROOT_PACKAGE));
+                                                                                     CORE_ROOT_PACKAGE));
 
         assertEquals(resolver.resolvePageClassNameToPageName(className), "core/CorePage");
 
@@ -412,7 +413,8 @@
         replay();
 
         ComponentClassResolver resolver = create(source, locator, new LibraryMapping(LIB_PREFIX,
-                LIB_ROOT_PACKAGE), new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
+                                                                                     LIB_ROOT_PACKAGE),
+                                                 new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
 
         assertEquals(resolver.resolvePageNameToClassName("lib/LibPage"), className);
 
@@ -436,7 +438,8 @@
         replay();
 
         ComponentClassResolver resolver = create(source, locator, new LibraryMapping(LIB_PREFIX,
-                LIB_ROOT_PACKAGE), new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
+                                                                                     LIB_ROOT_PACKAGE),
+                                                 new LibraryMapping(CORE_PREFIX, CORE_ROOT_PACKAGE));
 
         assertEquals(resolver.resolvePageNameToClassName("lib/libpage"), className);
         assertEquals(resolver.resolvePageNameToClassName("LIB/LIBPAGE"), className);
@@ -456,7 +459,7 @@
         replay();
 
         ComponentClassResolver resolver = create(source, locator, new LibraryMapping(CORE_PREFIX,
-                CORE_ROOT_PACKAGE));
+                                                                                     CORE_ROOT_PACKAGE));
 
         String className = LIB_ROOT_PACKAGE + ".pages.LibPage";
 
@@ -490,7 +493,7 @@
         replay();
 
         ComponentClassResolver resolver = create(source, locator, new LibraryMapping(CORE_PREFIX,
-                CORE_ROOT_PACKAGE));
+                                                                                     CORE_ROOT_PACKAGE));
 
         try
         {
@@ -519,7 +522,7 @@
         replay();
 
         ComponentClassResolver resolver = create(source, locator, new LibraryMapping(CORE_PREFIX,
-                CORE_ROOT_PACKAGE));
+                                                                                     CORE_ROOT_PACKAGE));
 
         String className = CORE_ROOT_PACKAGE + ".foo.CorePage";
 
@@ -585,7 +588,8 @@
         replay();
 
         ComponentClassResolver resolver = create(source, locator, new LibraryMapping("lib/deep",
-                deepPackage), new LibraryMapping(LIB_PREFIX, LIB_ROOT_PACKAGE), new LibraryMapping(
+                                                                                     deepPackage),
+                                                 new LibraryMapping(LIB_PREFIX, LIB_ROOT_PACKAGE), new LibraryMapping(
                 CORE_PREFIX, CORE_ROOT_PACKAGE));
 
         try
@@ -671,7 +675,7 @@
         replay();
 
         ComponentClassResolver resolver = create(source, locator, new LibraryMapping(CORE_PREFIX,
-                CORE_ROOT_PACKAGE));
+                                                                                     CORE_ROOT_PACKAGE));
 
         try
         {
@@ -699,7 +703,7 @@
         replay();
 
         ComponentClassResolver resolver = create(source, locator, new LibraryMapping(CORE_PREFIX,
-                CORE_ROOT_PACKAGE));
+                                                                                     CORE_ROOT_PACKAGE));
 
         try
         {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentDefaultProviderImplTest.java Mon Nov 12 14:22:31 2007
@@ -164,14 +164,14 @@
     }
 
     protected final void train_getPropertyAdapter(ClassPropertyAdapter classPropertyAdapter,
-            String propertyName, PropertyAdapter propertyAdapter)
+                                                  String propertyName, PropertyAdapter propertyAdapter)
     {
         expect(classPropertyAdapter.getPropertyAdapter(propertyName)).andReturn(propertyAdapter)
                 .atLeastOnce();
     }
 
     protected final void train_getAdapter(PropertyAccess access, Object object,
-            ClassPropertyAdapter classPropertyAdapter)
+                                          ClassPropertyAdapter classPropertyAdapter)
     {
         expect(access.getAdapter(object)).andReturn(classPropertyAdapter);
     }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentEventImplTest.java Mon Nov 12 14:22:31 2007
@@ -47,7 +47,7 @@
         replay();
 
         ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler,
-                _coercer);
+                                                      _coercer);
 
         assertTrue(event.matchesByEventType("eventType"));
         assertFalse(event.matchesByEventType("foo"));
@@ -63,7 +63,7 @@
         replay();
 
         ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler,
-                _coercer);
+                                                      _coercer);
 
         assertTrue(event.matchesByEventType("EVENTTYPE"));
 
@@ -78,7 +78,7 @@
         replay();
 
         ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler,
-                _coercer);
+                                                      _coercer);
 
         assertTrue(event.matchesByComponentId("someId"));
 
@@ -94,7 +94,7 @@
 
         replay();
         ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler,
-                _coercer);
+                                                      _coercer);
 
         assertTrue(event.matchesByComponentId("SOMEID"));
 
@@ -109,7 +109,7 @@
         replay();
 
         ComponentEvent event = new ComponentEventImpl("eventType", "someId", new String[]
-        { "27" }, handler, _coercer);
+                {"27"}, handler, _coercer);
 
         assertEquals(event.coerceContext(0, "java.lang.Integer"), new Integer(27));
 
@@ -125,7 +125,7 @@
         replay();
 
         ComponentEvent event = new ComponentEventImpl("eventType", "someId", new String[]
-        { "27" }, handler, _coercer);
+                {"27"}, handler, _coercer);
 
         event.setSource(component, "foo.Bar.baz()");
 
@@ -152,7 +152,7 @@
         replay();
 
         ComponentEvent event = new ComponentEventImpl("eventType", "someId", new String[]
-        { "abc" }, handler, _coercer);
+                {"abc"}, handler, _coercer);
 
         event.setSource(component, "foo.Bar.baz()");
 
@@ -187,7 +187,7 @@
         replay();
 
         ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler,
-                _coercer);
+                                                      _coercer);
 
         event.setSource(component, methodDescription);
 
@@ -213,7 +213,7 @@
         replay();
 
         ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler,
-                _coercer);
+                                                      _coercer);
 
         event.setSource(component, methodDescription);
 
@@ -233,7 +233,7 @@
         replay();
 
         ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler,
-                _coercer);
+                                                      _coercer);
 
         event.setSource(component, "foo.Bar.baz()");
 
@@ -257,7 +257,7 @@
         replay();
 
         ComponentEvent event = new ComponentEventImpl("eventType", "someId", null, handler,
-                _coercer);
+                                                      _coercer);
 
         event.setSource(component, "foo.Bar.baz()");
         event.storeResult(result);

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,26 +14,8 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLConnection;
-import java.util.UUID;
-
-import javassist.CannotCompileException;
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtMethod;
-import javassist.CtNewMethod;
-import javassist.LoaderClassPath;
-import javassist.NotFoundException;
-
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.SingleKeySymbolProvider;
-import org.apache.tapestry.internal.SyntheticModuleDef;
-import org.apache.tapestry.internal.SyntheticSymbolSourceContributionDef;
+import javassist.*;
+import org.apache.tapestry.internal.*;
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
 import org.apache.tapestry.internal.transform.pages.BasicComponent;
 import org.apache.tapestry.internal.transform.pages.BasicSubComponent;
@@ -50,6 +32,13 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.URLConnection;
+import java.util.UUID;
+
 /**
  * Tests for {@link org.apache.tapestry.internal.services.ComponentInstantiatorSourceImpl}. Several
  * of these tests are more of the form of integration tests that instantiate the Tapestry IoC
@@ -83,7 +72,7 @@
         replay();
 
         ComponentInstantiatorSourceImpl e = new ComponentInstantiatorSourceImpl(_contextLoader,
-                transformer, logger);
+                                                                                transformer, logger);
 
         assertEquals(e.inControlledPackage("foo.bar.Baz"), false);
 
@@ -108,7 +97,9 @@
         verify();
     }
 
-    /** More of an integration test. */
+    /**
+     * More of an integration test.
+     */
     @Test
     public void load_component_via_service() throws Exception
     {
@@ -213,7 +204,7 @@
     }
 
     private void createSynthComponentClass(String name) throws CannotCompileException,
-            NotFoundException, IOException
+                                                               NotFoundException, IOException
     {
         ClassPool pool = new ClassPool();
         // Inside Maven Surefire, the system classpath is not sufficient to find all
@@ -277,7 +268,7 @@
         URL url = _extraClasspath.toURL();
 
         _extraLoader = new URLClassLoader(new URL[]
-        { url }, _contextLoader);
+                {url}, _contextLoader);
         RegistryBuilder builder = new RegistryBuilder(_extraLoader);
 
         builder.add(TapestryModule.class);
@@ -285,7 +276,7 @@
         SymbolProvider provider = new SingleKeySymbolProvider(
                 InternalConstants.TAPESTRY_ALIAS_MODE_SYMBOL, "servlet");
         ContributionDef contribution = new SyntheticSymbolSourceContributionDef("AliasMode",
-                provider, "before:ApplicationDefaults");
+                                                                                provider, "before:ApplicationDefaults");
 
         ModuleDef module = new SyntheticModuleDef(contribution);
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInvocationTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInvocationTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInvocationTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentInvocationTest.java Mon Nov 12 14:22:31 2007
@@ -23,7 +23,7 @@
     public void no_context()
     {
         ComponentInvocation invocation = new ComponentInvocation(new OpaqueConstantTarget("abc"),
-                new String[0], null);
+                                                                 new String[0], null);
         assertEquals(invocation.buildURI(false), "abc");
         assertEquals(invocation.buildURI(true), "abc");
     }
@@ -32,8 +32,8 @@
     public void context()
     {
         ComponentInvocation invocation = new ComponentInvocation(new OpaqueConstantTarget("abc"),
-                new String[]
-                { "x", "123" }, null);
+                                                                 new String[]
+                                                                         {"x", "123"}, null);
         assertEquals(invocation.buildURI(false), "abc/x/123");
         assertEquals(invocation.buildURI(true), "abc/x/123");
     }
@@ -42,8 +42,8 @@
     public void parameters()
     {
         ComponentInvocation invocation = new ComponentInvocation(new OpaqueConstantTarget("abc"),
-                new String[]
-                { "x", "123" }, null);
+                                                                 new String[]
+                                                                         {"x", "123"}, null);
         invocation.addParameter("p1", "foo");
         invocation.addParameter("p2", "bar");
         assertEquals(invocation.buildURI(false), "abc/x/123?p1=foo&p2=bar");

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.lang.reflect.Modifier;
-
 import org.apache.tapestry.MarkupWriter;
 import org.apache.tapestry.annotations.SetupRender;
 import org.apache.tapestry.model.MutableComponentModel;
@@ -26,6 +24,8 @@
 import org.apache.tapestry.test.TapestryTestCase;
 import org.testng.annotations.Test;
 
+import java.lang.reflect.Modifier;
+
 /**
  * Of course, we're committing the cardinal sin of testing the code that's generated, rather than
  * the *behavior* of the generated code. Fortunately, we back all this up with lots and lots of
@@ -233,7 +233,7 @@
         SetupRender annotation = newSetupRender();
 
         TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "void", "aMethod", new String[]
-        { MarkupWriter.class.getName() }, null);
+                {MarkupWriter.class.getName()}, null);
 
         train_findMethods(tf, sig);
 
@@ -265,7 +265,7 @@
         SetupRender annotation = newSetupRender();
 
         TransformMethodSignature sig = new TransformMethodSignature(Modifier.PROTECTED, "boolean", "aMethod", null,
-                null);
+                                                                    null);
 
         train_findMethods(tf, sig);
 
@@ -302,9 +302,9 @@
         SetupRender annotation = newSetupRender();
 
         TransformMethodSignature siga = new TransformMethodSignature(Modifier.PROTECTED, "boolean", "aMethod", null,
-                null);
+                                                                     null);
         TransformMethodSignature sigb = new TransformMethodSignature(Modifier.PUBLIC, "void", "bMethod", new String[]
-        { MarkupWriter.class.getName() }, null);
+                {MarkupWriter.class.getName()}, null);
 
         String ida = "aMethod()";
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.util.Locale;
-
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
 import org.apache.tapestry.internal.util.URLChangeTracker;
 import org.apache.tapestry.ioc.Messages;
@@ -25,6 +23,8 @@
 import org.apache.tapestry.services.ComponentMessagesSource;
 import org.testng.annotations.Test;
 
+import java.util.Locale;
+
 /**
  * Tests {@link ComponentMessagesSourceImpl} as well as {@link MessagesSourceImpl} (which contains
  * code refactored out of CMSI).
@@ -206,7 +206,7 @@
         forceCacheClear();
 
         ComponentMessagesSource source = new ComponentMessagesSourceImpl(_simpleComponentResource,
-                "NoSuchAppCatalog.properties");
+                                                                         "NoSuchAppCatalog.properties");
 
         Messages messages = source.getMessages(model, Locale.ENGLISH);
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentSourceImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentSourceImplTest.java Mon Nov 12 14:22:31 2007
@@ -91,6 +91,7 @@
 
     @Test
     public void get_page_by_class()
-    {}
+    {
+    }
 
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,6 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Locale;
-import java.util.UUID;
-
 import org.apache.tapestry.internal.InternalConstants;
 import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.internal.parser.ComponentTemplate;
@@ -30,6 +23,13 @@
 import org.apache.tapestry.model.ComponentModel;
 import org.testng.annotations.Test;
 
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Locale;
+import java.util.UUID;
+
 public class ComponentTemplateSourceImplTest extends InternalBaseTestCase
 {
     private static final String PACKAGE = "org.apache.tapestry.internal.pageload";
@@ -41,7 +41,7 @@
     /**
      * Creates a new class loader, whose parent is the thread's context class loader, but adds a
      * single classpath root from the filesystem.
-     * 
+     *
      * @see #createClasspathRoot()
      */
     protected final URLClassLoader newLoaderWithClasspathRoot(File rootDir)
@@ -52,12 +52,12 @@
         URL url = new URL(urlPath + "/");
 
         return new URLClassLoader(new URL[]
-        { url }, _loader);
+                {url}, _loader);
     }
 
     /**
      * Creates a new temporary directory which can act as a classpath root.
-     * 
+     *
      * @see #newLoaderWithClasspathRoot(File)
      */
     protected final File createClasspathRoot()
@@ -98,7 +98,9 @@
         verify();
     }
 
-    /** Tests resource invalidation. */
+    /**
+     * Tests resource invalidation.
+     */
     @Test
     public void invalidation() throws Exception
     {
@@ -171,7 +173,9 @@
         verify();
     }
 
-    /** Checks that localization to the same resource works (w/ caching). */
+    /**
+     * Checks that localization to the same resource works (w/ caching).
+     */
     @Test
     public void localization_to_same()
     {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ContextImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ContextImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ContextImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ContextImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,19 +14,18 @@
 
 package org.apache.tapestry.internal.services;
 
+import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry.services.Context;
+import org.testng.annotations.Test;
+
+import javax.servlet.ServletContext;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
-import javax.servlet.ServletContext;
-
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.Context;
-import org.testng.annotations.Test;
-
 public class ContextImplTest extends InternalBaseTestCase
 {
     @Test
@@ -126,7 +125,9 @@
         verify();
     }
 
-    /** Tomcat 5.5.20 appears to sometimes return null if it can't find a match. */
+    /**
+     * Tomcat 5.5.20 appears to sometimes return null if it can't find a match.
+     */
     @Test
     public void ignore_null_from_get_resource_paths() throws Exception
     {
@@ -150,7 +151,7 @@
     }
 
     protected final void train_getResourcePaths(ServletContext context, String path,
-            String... paths)
+                                                String... paths)
     {
         Set<String> set = CollectionFactory.newSet(Arrays.asList(paths));
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ContextResourceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ContextResourceTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ContextResourceTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ContextResourceTest.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.net.URL;
-
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
 import org.apache.tapestry.ioc.Resource;
 import org.apache.tapestry.services.Context;
 import org.testng.annotations.Test;
+
+import java.net.URL;
 
 public class ContextResourceTest extends InternalBaseTestCase
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/CookiesImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/CookiesImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/CookiesImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/CookiesImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,15 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.Cookie;
-
 import org.apache.tapestry.internal.test.TestableRequestImpl;
 import org.apache.tapestry.ioc.internal.util.CollectionFactory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import javax.servlet.http.Cookie;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Tests for {@link org.apache.tapestry.services.impl.CookiesImpl}.
  */
@@ -101,13 +100,13 @@
     public void test_Match()
     {
         attempt("fred", "flintstone", new String[]
-        { "barney", "rubble", "fred", "flintstone" });
+                {"barney", "rubble", "fred", "flintstone"});
     }
 
     public void test_No_Match()
     {
         attempt("foo", null, new String[]
-        { "bar", "baz" });
+                {"bar", "baz"});
     }
 
     public void test_Write_Cookie_Domain()

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/DefaultInjectionProviderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/DefaultInjectionProviderTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/DefaultInjectionProviderTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/DefaultInjectionProviderTest.java Mon Nov 12 14:22:31 2007
@@ -14,9 +14,6 @@
 
 package org.apache.tapestry.internal.services;
 
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.isA;
-
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
 import org.apache.tapestry.ioc.AnnotationProvider;
 import org.apache.tapestry.ioc.ObjectLocator;
@@ -24,6 +21,8 @@
 import org.apache.tapestry.services.ClassTransformation;
 import org.apache.tapestry.services.MasterObjectProvider;
 import org.apache.tapestry.services.Request;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.isA;
 import org.testng.annotations.Test;
 
 public class DefaultInjectionProviderTest extends InternalBaseTestCase

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/DocumentHeadBuilderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/DocumentHeadBuilderImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/DocumentHeadBuilderImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/DocumentHeadBuilderImplTest.java Mon Nov 12 14:22:31 2007
@@ -154,7 +154,7 @@
 
         builder.updateDocument(document);
 
-      assertEquals(document.toString(), readFile("add_script.txt", false).trim());
+        assertEquals(document.toString(), readFile("add_script.txt", false).trim());
     }
 
     /**

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/EnvironmentImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/EnvironmentImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/EnvironmentImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/EnvironmentImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,15 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
 import org.apache.tapestry.ioc.Location;
 import org.apache.tapestry.runtime.Component;
 import org.apache.tapestry.services.Environment;
 import org.apache.tapestry.test.TapestryTestCase;
 import org.testng.annotations.Test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
 
 public class EnvironmentImplTest extends TapestryTestCase
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidatorDefaultSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidatorDefaultSourceImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidatorDefaultSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidatorDefaultSourceImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.util.Locale;
-
 import org.apache.tapestry.Field;
 import org.apache.tapestry.FieldValidator;
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
@@ -26,6 +24,8 @@
 import org.apache.tapestry.services.ValidationConstraintGenerator;
 import org.testng.annotations.Test;
 
+import java.util.Locale;
+
 public class FieldValidatorDefaultSourceImplTest extends InternalBaseTestCase
 {
     @SuppressWarnings("unchecked")
@@ -74,7 +74,7 @@
         replay();
 
         FieldValidatorDefaultSource fieldValidatorSource = new FieldValidatorDefaultSourceImpl(gen,
-                source);
+                                                                                               source);
 
         FieldValidator composite = fieldValidatorSource.createDefaultValidator(
                 field,
@@ -110,7 +110,7 @@
         replay();
 
         FieldValidatorDefaultSource fieldValidatorSource = new FieldValidatorDefaultSourceImpl(gen,
-                source);
+                                                                                               source);
 
         FieldValidator composite = fieldValidatorSource.createDefaultValidator(
                 field,
@@ -144,7 +144,7 @@
         replay();
 
         FieldValidatorDefaultSource fieldValidatorSource = new FieldValidatorDefaultSourceImpl(gen,
-                source);
+                                                                                               source);
 
         FieldValidator composite = fieldValidatorSource.createDefaultValidator(
                 field,

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidatorSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidatorSourceImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidatorSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FieldValidatorSourceImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,6 @@
 
 package org.apache.tapestry.internal.services;
 
-import static java.util.Collections.singletonMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
 import org.apache.tapestry.ComponentResources;
 import org.apache.tapestry.Field;
 import org.apache.tapestry.FieldValidator;
@@ -29,18 +21,27 @@
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
 import org.apache.tapestry.ioc.MessageFormatter;
 import org.apache.tapestry.ioc.Messages;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
 import org.apache.tapestry.ioc.services.TypeCoercer;
 import org.apache.tapestry.runtime.Component;
 import org.apache.tapestry.services.FieldValidatorSource;
 import org.apache.tapestry.services.ValidationMessagesSource;
 import org.testng.annotations.Test;
 
+import java.util.Arrays;
+import static java.util.Collections.singletonMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
 public class FieldValidatorSourceImplTest extends InternalBaseTestCase
 {
     public interface FieldComponent extends Field, Component
     {
 
-    };
+    }
+
+    ;
 
     @Test
     public void unknown_validator_type()
@@ -64,7 +65,7 @@
         replay();
 
         FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null,
-                map);
+                                                                   map);
 
         try
         {
@@ -119,7 +120,7 @@
         replay();
 
         FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null,
-                map);
+                                                                   map);
 
         FieldValidator fieldValidator = source.createValidator(field, "required", null);
 
@@ -160,7 +161,7 @@
         replay();
 
         FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null,
-                map);
+                                                                   map);
 
         FieldValidator fieldValidator = source.createValidator(field, "required", null);
 
@@ -212,7 +213,7 @@
         replay();
 
         FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null,
-                map);
+                                                                   map);
 
         FieldValidator fieldValidator = source.createValidators(field, "minlength");
 
@@ -246,7 +247,7 @@
         replay();
 
         FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null,
-                map);
+                                                                   map);
 
         try
         {
@@ -301,7 +302,7 @@
         replay();
 
         FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null,
-                map);
+                                                                   map);
 
         FieldValidator fieldValidator = source.createValidators(field, "required");
 
@@ -365,7 +366,7 @@
         replay();
 
         FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null,
-                map);
+                                                                   map);
 
         FieldValidator fieldValidator = source.createValidators(field, "required,minLength=15");
 
@@ -414,7 +415,7 @@
         replay();
 
         FieldValidatorSource source = new FieldValidatorSourceImpl(messagesSource, coercer, null,
-                map);
+                                                                   map);
 
         FieldValidator fieldValidator = source.createValidator(field, "minLength", "5");
 
@@ -472,7 +473,8 @@
     public void whitespace_ignored_around_value()
     {
         test("minLength=  5 , sameAs  = otherComponentId ", new ValidatorSpecification("minLength",
-                "5"), new ValidatorSpecification("sameAs", "otherComponentId"));
+                                                                                       "5"),
+             new ValidatorSpecification("sameAs", "otherComponentId"));
     }
 
     @Test

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FlashPersistentFieldStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FlashPersistentFieldStrategyTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FlashPersistentFieldStrategyTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FlashPersistentFieldStrategyTest.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,15 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.util.Collection;
-import java.util.Iterator;
-
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
 import org.apache.tapestry.services.PersistentFieldChange;
 import org.apache.tapestry.services.PersistentFieldStrategy;
 import org.apache.tapestry.services.Request;
 import org.apache.tapestry.services.Session;
 import org.testng.annotations.Test;
+
+import java.util.Collection;
+import java.util.Iterator;
 
 /**
  * A more minimal test, since common behavior is already tested by

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FooInterface.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FooInterface.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FooInterface.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/FooInterface.java Mon Nov 12 14:22:31 2007
@@ -1,21 +1,21 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package org.apache.tapestry.internal.services;
 
 /**
- * 
+ *
  */
 public interface FooInterface
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/GetterMethodsInterface.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/GetterMethodsInterface.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/GetterMethodsInterface.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/GetterMethodsInterface.java Mon Nov 12 14:22:31 2007
@@ -1,21 +1,21 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package org.apache.tapestry.internal.services;
 
 /**
- * 
+ *
  */
 public interface GetterMethodsInterface
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,24 +14,7 @@
 
 package org.apache.tapestry.internal.services;
 
-import static java.lang.Thread.currentThread;
-import static java.util.Arrays.asList;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Target;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtMethod;
-import javassist.Loader;
-import javassist.LoaderClassPath;
-import javassist.NotFoundException;
-
+import javassist.*;
 import org.apache.tapestry.annotations.Meta;
 import org.apache.tapestry.annotations.OnEvent;
 import org.apache.tapestry.annotations.Retain;
@@ -39,16 +22,7 @@
 import org.apache.tapestry.internal.InternalComponentResources;
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
 import org.apache.tapestry.internal.transform.InheritedAnnotation;
-import org.apache.tapestry.internal.transform.pages.AbstractFoo;
-import org.apache.tapestry.internal.transform.pages.BarImpl;
-import org.apache.tapestry.internal.transform.pages.BasicComponent;
-import org.apache.tapestry.internal.transform.pages.ChildClassInheritsAnnotation;
-import org.apache.tapestry.internal.transform.pages.ClaimedFields;
-import org.apache.tapestry.internal.transform.pages.EventHandlerTarget;
-import org.apache.tapestry.internal.transform.pages.MethodIdentifier;
-import org.apache.tapestry.internal.transform.pages.ParentClass;
-import org.apache.tapestry.internal.transform.pages.TargetObject;
-import org.apache.tapestry.internal.transform.pages.TargetObjectSubclass;
+import org.apache.tapestry.internal.transform.pages.*;
 import org.apache.tapestry.ioc.internal.services.PropertyAccessImpl;
 import org.apache.tapestry.ioc.services.PropertyAccess;
 import org.apache.tapestry.runtime.Component;
@@ -62,6 +36,16 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import static java.lang.Thread.currentThread;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Target;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.Arrays;
+import static java.util.Arrays.asList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * The tests share a number of resources, and so are run sequentially.
  */
@@ -490,7 +474,7 @@
         replay();
 
         InternalClassTransformation ct = new InternalClassTransformationImpl(targetObjectCtClass,
-                _contextClassLoader, logger, null);
+                                                                             _contextClassLoader, logger, null);
 
         // Default behavior is to add an injected field for the InternalComponentResources object,
         // so we'll just check that.
@@ -522,7 +506,7 @@
         replay();
 
         InternalClassTransformation ct = new InternalClassTransformationImpl(targetObjectCtClass,
-                _loader, logger, null);
+                                                                             _loader, logger, null);
 
         String parentFieldName = ct.addInjectedField(String.class, "_value", value);
 
@@ -551,7 +535,7 @@
         // This proves the the field is protected and can be used in subclasses.
 
         ct.addMethod(new TransformMethodSignature(Modifier.PUBLIC, "java.lang.String", "getValue",
-                null, null), "return " + subclassFieldName + ";");
+                                                  null, null), "return " + subclassFieldName + ";");
 
         ct.finish();
 
@@ -578,7 +562,7 @@
         replay();
 
         InternalClassTransformation ct = new InternalClassTransformationImpl(ctClass,
-                _contextClassLoader, logger, null);
+                                                                             _contextClassLoader, logger, null);
 
         _classPool.toClass(ctClass, _loader);
 
@@ -609,7 +593,7 @@
         replay();
 
         InternalClassTransformation ct = new InternalClassTransformationImpl(targetObjectCtClass,
-                _contextClassLoader, logger, null);
+                                                                             _contextClassLoader, logger, null);
 
         ct.addImplementedInterface(FooInterface.class);
         ct.addImplementedInterface(GetterMethodsInterface.class);
@@ -621,7 +605,7 @@
         Class[] interfaces = transformed.getInterfaces();
 
         assertEquals(interfaces, new Class[]
-        { Component.class, FooInterface.class, GetterMethodsInterface.class });
+                {Component.class, FooInterface.class, GetterMethodsInterface.class});
 
         Object target = ct.createInstantiator(transformed).newInstance(resources);
 
@@ -657,7 +641,7 @@
         CtClass targetObjectCtClass = findCtClass(ReadOnlyBean.class);
 
         InternalClassTransformation ct = new InternalClassTransformationImpl(targetObjectCtClass,
-                _contextClassLoader, logger, null);
+                                                                             _contextClassLoader, logger, null);
 
         ct.makeReadOnly("_value");
 
@@ -696,7 +680,7 @@
         CtClass targetObjectCtClass = findCtClass(RemoveFieldBean.class);
 
         InternalClassTransformation ct = new InternalClassTransformationImpl(targetObjectCtClass,
-                _contextClassLoader, logger, null);
+                                                                             _contextClassLoader, logger, null);
 
         ct.removeField("_barney");
 
@@ -717,7 +701,7 @@
         CtClass targetObjectCtClass = findCtClass(ReadOnlyBean.class);
 
         InternalClassTransformation ct = new InternalClassTransformationImpl(targetObjectCtClass,
-                _contextClassLoader, logger, null);
+                                                                             _contextClassLoader, logger, null);
 
         ct.extendConstructor("_value = \"from constructor\";");
 
@@ -746,7 +730,7 @@
         CtClass targetObjectCtClass = findCtClass(ReadOnlyBean.class);
 
         InternalClassTransformation ct = new InternalClassTransformationImpl(targetObjectCtClass,
-                _contextClassLoader, logger, null);
+                                                                             _contextClassLoader, logger, null);
 
         ct.injectField("_value", "Tapestry");
 
@@ -793,7 +777,7 @@
         CtClass targetObjectCtClass = findCtClass(FieldAccessBean.class);
 
         InternalClassTransformation ct = new InternalClassTransformationImpl(targetObjectCtClass,
-                _contextClassLoader, logger, null);
+                                                                             _contextClassLoader, logger, null);
 
         replaceAccessToField(ct, "foo");
         replaceAccessToField(ct, "bar");
@@ -861,7 +845,7 @@
 
         TransformMethodSignature writeMethodSignature = new TransformMethodSignature(
                 Modifier.PRIVATE, "void", writeMethodName, new String[]
-                { STRING_CLASS_NAME }, null);
+                {STRING_CLASS_NAME}, null);
         ct.addMethod(writeMethodSignature, String.format(
                 "throw new RuntimeException(\"write %s\");",
                 baseName));
@@ -1039,17 +1023,19 @@
 
         verify();
     }
-    
+
     @Test
-    public void prefix_method() throws Exception {
+    public void prefix_method() throws Exception
+    {
         Logger logger = mockLogger();
-        TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "int", "getParentField", null, null);
-        
+        TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "int", "getParentField", null,
+                                                                    null);
+
         replay();
-        
+
         InternalClassTransformation ct = createClassTransformation(ParentClass.class, logger);
         ct.prefixMethod(sig, "return 42;");
-        
+
         String desc = ct.toString();
         assertTrue(desc.contains("prefix"));
         assertTrue(desc.contains("getParentField"));
@@ -1061,11 +1047,13 @@
             ct.prefixMethod(sig, "return 0;");
             unreachable();
         }
-        catch (IllegalStateException e) { }
-        
-        
+        catch (IllegalStateException e)
+        {
+        }
+
+
         verify();
-    }    
+    }
 
     @Test
     public void remove_field() throws Exception
@@ -1077,7 +1065,7 @@
         CtClass targetObjectCtClass = findCtClass(FieldRemoval.class);
 
         InternalClassTransformation ct = new InternalClassTransformationImpl(targetObjectCtClass,
-                _contextClassLoader, logger, null);
+                                                                             _contextClassLoader, logger, null);
 
         ct.removeField("_fieldToRemove");
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,6 @@
 
 package org.apache.tapestry.internal.services;
 
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.isA;
-import static org.easymock.EasyMock.isNull;
-
 import org.apache.tapestry.ComponentEventHandler;
 import org.apache.tapestry.Link;
 import org.apache.tapestry.TapestryConstants;
@@ -30,6 +26,7 @@
 import org.apache.tapestry.services.Request;
 import org.apache.tapestry.services.Response;
 import org.easymock.EasyMock;
+import static org.easymock.EasyMock.*;
 import org.easymock.IAnswer;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
@@ -297,7 +294,7 @@
 
     @SuppressWarnings("unchecked")
     private void train_triggerPassivateEventForPageLink(ComponentPageElement rootElement,
-            LinkFactoryListener listener, Holder<Link> holder)
+                                                        LinkFactoryListener listener, Holder<Link> holder)
     {
         IAnswer<Boolean> triggerEventAnswer = newAnswerForPassivateEventTrigger();
 
@@ -318,7 +315,7 @@
 
     @SuppressWarnings("unchecked")
     private void train_triggerPassivateEventForActionLink(ComponentPageElement rootElement,
-            LinkFactoryListener listener, Holder<Link> holder)
+                                                          LinkFactoryListener listener, Holder<Link> holder)
     {
         IAnswer<Boolean> triggerEventAnswer = newAnswerForPassivateEventTrigger();
 
@@ -363,7 +360,7 @@
                         .getCurrentArguments()[2];
 
                 handler.handleResult(new Object[]
-                { "foo", "bar" }, null, null);
+                        {"foo", "bar"}, null, null);
 
                 return true;
             }
@@ -372,7 +369,7 @@
 
     @SuppressWarnings("unchecked")
     private void testActionLink(String contextPath, String logicalPageName, String nestedId,
-            String eventName, String expectedURI, Object... context)
+                                String eventName, String expectedURI, Object... context)
     {
         Request request = mockRequest();
         Response response = mockResponse();

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.util.Arrays;
-
 import org.apache.tapestry.Link;
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
 import org.apache.tapestry.services.Response;
 import org.testng.annotations.Test;
+
+import java.util.Arrays;
 
 public class LinkImplTest extends InternalBaseTestCase
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LocalizationFilterTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LocalizationFilterTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LocalizationFilterTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LocalizationFilterTest.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,15 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.io.IOException;
-import java.util.Locale;
-
 import org.apache.tapestry.services.Request;
 import org.apache.tapestry.services.RequestFilter;
 import org.apache.tapestry.services.RequestHandler;
 import org.apache.tapestry.services.Response;
 import org.apache.tapestry.test.TapestryTestCase;
 import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.Locale;
 
 public class LocalizationFilterTest extends TapestryTestCase
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LocalizationSetterImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LocalizationSetterImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LocalizationSetterImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LocalizationSetterImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.util.Locale;
-
 import org.apache.tapestry.ioc.services.ThreadLocale;
 import org.apache.tapestry.services.PersistentLocale;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.util.Locale;
+
 public class LocalizationSetterImplTest extends Assert
 {
     private PersistentLocale _nullPersistentLocale = new PersistentLocale()
@@ -89,7 +89,7 @@
     public void to_locale_is_cached()
     {
         LocalizationSetterImpl filter = new LocalizationSetterImpl(_nullPersistentLocale, null,
-                "en");
+                                                                   "en");
 
         Locale l1 = filter.toLocale("en");
 
@@ -101,7 +101,7 @@
     }
 
     private void checkLocale(Locale l, String expectedLanguage, String expectedCountry,
-            String expectedVariant)
+                             String expectedVariant)
     {
         assertEquals(l.getLanguage(), expectedLanguage);
         assertEquals(l.getCountry(), expectedCountry);
@@ -112,7 +112,7 @@
     public void to_locale()
     {
         LocalizationSetterImpl filter = new LocalizationSetterImpl(_nullPersistentLocale, null,
-                "en");
+                                                                   "en");
 
         checkLocale(filter.toLocale("en"), "en", "", "");
         checkLocale(filter.toLocale("klingon_Gach"), "klingon", "GACH", "");
@@ -125,7 +125,7 @@
         ThreadLocale threadLocale = new ThreadLocaleImpl();
         threadLocale.setLocale(Locale.FRENCH);
         LocalizationSetter setter = new LocalizationSetterImpl(_nullPersistentLocale, threadLocale,
-                "en,fr");
+                                                               "en,fr");
         setter.setThreadLocale(Locale.CANADA_FRENCH);
         assertEquals(threadLocale.getLocale(), Locale.FRENCH);
 
@@ -137,7 +137,7 @@
         ThreadLocale threadLocale = new ThreadLocaleImpl();
         threadLocale.setLocale(Locale.FRENCH);
         LocalizationSetter setter = new LocalizationSetterImpl(_nullPersistentLocale, threadLocale,
-                "en,fr");
+                                                               "en,fr");
         setter.setThreadLocale(Locale.JAPANESE);
         assertEquals(threadLocale.getLocale(), Locale.ENGLISH);
     }
@@ -147,7 +147,7 @@
     {
         ThreadLocale threadLocale = new ThreadLocaleImpl();
         LocalizationSetter setter = new LocalizationSetterImpl(_frenchPersistentLocale,
-                threadLocale, "en,fr");
+                                                               threadLocale, "en,fr");
         setter.setThreadLocale(Locale.ENGLISH);
         assertEquals(threadLocale.getLocale(), Locale.FRENCH);
     }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MetaDataLocatorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MetaDataLocatorImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MetaDataLocatorImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MetaDataLocatorImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,15 @@
 
 package org.apache.tapestry.internal.services;
 
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.util.Collections;
-import java.util.Map;
-
 import org.apache.tapestry.ComponentResources;
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
 import org.apache.tapestry.model.ComponentModel;
 import org.apache.tapestry.services.MetaDataLocator;
 import org.testng.annotations.Test;
+
+import java.util.Collections;
+import java.util.Map;
 
 public class MetaDataLocatorImplTest extends InternalBaseTestCase
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MetaWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MetaWorkerTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MetaWorkerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MetaWorkerTest.java Mon Nov 12 14:22:31 2007
@@ -47,7 +47,7 @@
         train_getAnnotation(ct, Meta.class, annotation);
 
         expect(annotation.value()).andReturn(new String[]
-        { "foo=bar", "baz=biff" });
+                {"foo=bar", "baz=biff"});
 
         model.setMeta("foo", "bar");
         model.setMeta("baz", "biff");

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MixinWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MixinWorkerTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MixinWorkerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/MixinWorkerTest.java Mon Nov 12 14:22:31 2007
@@ -108,7 +108,7 @@
     }
 
     protected final void train_resolveMixinTypeToClassName(ComponentClassResolver resolver,
-            String mixinType, String mixinClassName)
+                                                           String mixinType, String mixinClassName)
     {
         expect(resolver.resolveMixinTypeToClassName(mixinType)).andReturn(mixinClassName);
     }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/Named.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/Named.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/Named.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/Named.java Mon Nov 12 14:22:31 2007
@@ -1,23 +1,21 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package org.apache.tapestry.internal.services;
 
 /**
  * Used by {@link org.apache.tapestry.internal.services.ComponentInstantiatorSourceImplTest}.
- * 
- * 
  */
 public interface Named
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ObjectComponentEventResultProcessorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ObjectComponentEventResultProcessorTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ObjectComponentEventResultProcessorTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ObjectComponentEventResultProcessorTest.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,16 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.tapestry.ComponentResources;
 import org.apache.tapestry.ioc.internal.util.TapestryException;
 import org.apache.tapestry.runtime.Component;
 import org.apache.tapestry.services.ComponentEventResultProcessor;
 import org.apache.tapestry.test.TapestryTestCase;
 import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 public class ObjectComponentEventResultProcessorTest extends TapestryTestCase
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageElementFactoryImplTest.java Mon Nov 12 14:22:31 2007
@@ -195,7 +195,7 @@
         replay();
 
         PageElementFactory factory = new PageElementFactoryImpl(source, resolver, typeCoercer,
-                bindingSource, messagesSource);
+                                                                bindingSource, messagesSource);
 
         try
         {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageLoaderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageLoaderImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageLoaderImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageLoaderImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,9 +14,6 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.util.Arrays;
-import java.util.Locale;
-
 import org.apache.tapestry.internal.InternalComponentResources;
 import org.apache.tapestry.internal.parser.ComponentTemplate;
 import org.apache.tapestry.internal.parser.EndElementToken;
@@ -31,6 +28,9 @@
 import org.apache.tapestry.services.ComponentClassResolver;
 import org.slf4j.Logger;
 import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.Locale;
 
 public class PageLoaderImplTest extends InternalBaseTestCase
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageLocatorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageLocatorTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageLocatorTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageLocatorTest.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,10 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.util.Locale;
-
 import org.testng.Assert;
 import org.testng.annotations.Test;
+
+import java.util.Locale;
 
 public class PageLocatorTest extends Assert
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PagePoolImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,15 @@
 
 package org.apache.tapestry.internal.services;
 
-import static org.easymock.EasyMock.contains;
-
-import java.util.Locale;
-
 import org.apache.tapestry.internal.structure.Page;
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
 import org.apache.tapestry.ioc.services.ThreadLocale;
 import org.apache.tapestry.services.ComponentClassResolver;
+import static org.easymock.EasyMock.contains;
 import org.slf4j.Logger;
 import org.testng.annotations.Test;
+
+import java.util.Locale;
 
 public class PagePoolImplTest extends InternalBaseTestCase
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java Mon Nov 12 14:22:31 2007
@@ -14,21 +14,13 @@
 
 package org.apache.tapestry.internal.services;
 
-import static org.easymock.EasyMock.aryEq;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.isA;
-
 import org.apache.tapestry.ComponentEventHandler;
 import org.apache.tapestry.TapestryConstants;
 import org.apache.tapestry.internal.structure.ComponentPageElement;
 import org.apache.tapestry.internal.structure.Page;
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.ComponentClassResolver;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
-import org.apache.tapestry.services.Dispatcher;
-import org.apache.tapestry.services.PageRenderRequestHandler;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry.services.*;
+import static org.easymock.EasyMock.*;
 import org.testng.annotations.Test;
 
 public class PageRenderDispatcherTest extends InternalBaseTestCase
@@ -119,7 +111,7 @@
         replay();
 
         PageRenderRequestHandler handler = new PageRenderRequestHandlerImpl(cache, processor,
-                renderer, response);
+                                                                            renderer, response);
 
         Dispatcher d = new PageRenderDispatcher(resolver, handler);
 
@@ -161,14 +153,14 @@
         train_getRootElement(page, rootElement);
 
         train_triggerEvent(rootElement, TapestryConstants.ACTIVATE_EVENT, new Object[]
-        { "zip", "zoom" }, null, false);
+                {"zip", "zoom"}, null, false);
 
         renderer.renderPageResponse(page, response);
 
         replay();
 
         PageRenderRequestHandler handler = new PageRenderRequestHandlerImpl(cache, processor,
-                renderer, response);
+                                                                            renderer, response);
 
         Dispatcher d = new PageRenderDispatcher(resolver, handler);
 
@@ -183,7 +175,7 @@
     }
 
     private void train_triggerEvent(ComponentPageElement element, String eventType,
-            Object[] context, ComponentEventHandler handler, boolean handled)
+                                    Object[] context, ComponentEventHandler handler, boolean handled)
     {
         expect(
                 element.triggerEvent(

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderSupportImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderSupportImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderSupportImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderSupportImplTest.java Mon Nov 12 14:22:31 2007
@@ -72,7 +72,7 @@
         replay();
 
         PageRenderSupport support = new PageRenderSupportImpl(builder, symbolSource, assetSource,
-                CORE_ASSET_PATH_UNEXPANDED);
+                                                              CORE_ASSET_PATH_UNEXPANDED);
 
         support.addScriptLink(asset);
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageTemplateLocatorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageTemplateLocatorImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageTemplateLocatorImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageTemplateLocatorImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.util.Locale;
-
 import org.apache.tapestry.internal.test.InternalBaseTestCase;
 import org.apache.tapestry.ioc.Resource;
 import org.apache.tapestry.model.ComponentModel;
 import org.apache.tapestry.services.ComponentClassResolver;
 import org.testng.annotations.Test;
+
+import java.util.Locale;
 
 public class PageTemplateLocatorImplTest extends InternalBaseTestCase
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java Mon Nov 12 14:22:31 2007
@@ -1,20 +1,20 @@
-// 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.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// 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.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package org.apache.tapestry.internal.services;
 
-import org.apache.tapestry.annotations.Parameter;
+import org.apache.tapestry.annotations.Parameter;
 
 /**
  * Used by {@link org.apache.tapestry.internal.services.ParameterWorkerTest}.
@@ -24,7 +24,7 @@
     @Parameter
     private String _object;
 
-    @Parameter(cache = false, name = "uncached", defaultPrefix="literal")
+    @Parameter(cache = false, name = "uncached", defaultPrefix = "literal")
     private String _uncachedObject;
 
     @Parameter(required = true)

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParameterWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParameterWorkerTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParameterWorkerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ParameterWorkerTest.java Mon Nov 12 14:22:31 2007
@@ -18,7 +18,6 @@
 import javassist.CtClass;
 import javassist.Loader;
 import javassist.LoaderClassPath;
-
 import org.apache.tapestry.Binding;
 import org.apache.tapestry.TapestryConstants;
 import org.apache.tapestry.internal.InternalComponentResources;
@@ -154,7 +153,7 @@
      * <li>Unbound parameters to do not attempt to read or update their bindings (they'll be
      * optional)</li>
      * </ul>
-     * 
+     *
      * @throws Exception
      */
     @Test
@@ -422,7 +421,7 @@
     }
 
     protected void train_isBound(InternalComponentResources resources, String parameterName,
-            boolean isBound)
+                                 boolean isBound)
     {
         expect(resources.isBound(parameterName)).andReturn(isBound);
     }
@@ -483,7 +482,9 @@
 
                 train_isInvariant(resources, "value", true);
 
-            };
+            }
+
+            ;
         };
 
         Component component = setupForIntegrationTest(
@@ -528,7 +529,9 @@
                 resources.bindParameter("value", _binding);
 
                 train_isInvariant(resources, "value", true);
-            };
+            }
+
+            ;
         };
 
         Component component = setupForIntegrationTest(
@@ -556,12 +559,14 @@
     }
 
     protected final <T> void train_readParameter(InternalComponentResources resources,
-            String parameterName, Class<T> expectedType, T value)
+                                                 String parameterName, Class<T> expectedType, T value)
     {
         expect(resources.readParameter(parameterName, expectedType)).andReturn(value);
     }
 
-    /** This is for the majority of tests. */
+    /**
+     * This is for the majority of tests.
+     */
     private Component setupForIntegrationTest(final InternalComponentResources resources)
             throws Exception
     {
@@ -591,8 +596,9 @@
     }
 
     private Component setupForIntegrationTest(InternalComponentResources resources, Logger logger,
-            String componentClassName, MutableComponentModel model, BindingSource source,
-            Runnable phaseTwoTraining) throws Exception
+                                              String componentClassName, MutableComponentModel model,
+                                              BindingSource source,
+                                              Runnable phaseTwoTraining) throws Exception
     {
         ClassPool pool = new ClassPool();
         ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
@@ -604,7 +610,8 @@
 
         CtClass ctClass = pool.get(componentClassName);
         InternalClassTransformation transformation = new InternalClassTransformationImpl(ctClass,
-                _contextClassLoader, logger, null);
+                                                                                         _contextClassLoader, logger,
+                                                                                         null);
 
         replay();
 
@@ -643,7 +650,7 @@
     }
 
     protected final void train_isInvariant(InternalComponentResources resources,
-            String parameterName, boolean invariant)
+                                           String parameterName, boolean invariant)
     {
         expect(resources.isInvariant(parameterName)).andReturn(invariant);
     }



Mime
View raw message