svn commit: r477910 [5/9] - in /tapestry/tapestry5: tapestry-core/trunk/ tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/bindings/ tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/test/ tapestry-core/trunk/src/main/resource...

[hl...@apache.org]

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java&r2=477910
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java Tue Nov 21 13:48:47 2006
@@ -12,370 +12,371 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.ioc.internal.services;
-
-import java.awt.Image;
-import java.beans.BeanDescriptor;
-import java.beans.BeanInfo;
-import java.beans.EventSetDescriptor;
-import java.beans.MethodDescriptor;
-import java.beans.PropertyDescriptor;
-import java.util.Arrays;
-import java.util.Random;
-
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.services.PropertyAdapter;
-import org.testng.annotations.Test;
-
-/**
- * 
- */
-public class PropertyAccessImplTest extends InternalBaseTestCase
-{
-    private static final String CLASS_NAME = PropertyAccessImplTest.class.getName();
-
-    private PropertyAccess _access = new PropertyAccessImpl();
-
-    private Random _random = new Random();
-
-    public static class Bean
-    {
-        private int _value;
-
-        public int getValue()
-        {
-            return _value;
-        }
-
-        public void setValue(int value)
-        {
-            _value = value;
-        }
-
-        @Override
-        public String toString()
-        {
-            return "PropertyUtilsTestBean";
-        }
-
-        public void setWriteOnly(boolean b)
-        {
-        }
-
-        public String getReadOnly()
-        {
-            return null;
-        }
-    }
-
-    public static class ExceptionBean
-    {
-        public boolean getFailure()
-        {
-            throw new RuntimeException("getFailure");
-        }
-
-        public void setFailure(boolean b)
-        {
-            throw new RuntimeException("setFailure");
-        }
-
-        @Override
-        public String toString()
-        {
-            return "PropertyUtilsExceptionBean";
-        }
-    }
-
-    public static class UglyBean
-    {
-    }
-
-    public static class UglyBeanBeanInfo implements BeanInfo
-    {
-
-        public BeanInfo[] getAdditionalBeanInfo()
-        {
-            return new BeanInfo[0];
-        }
-
-        public BeanDescriptor getBeanDescriptor()
-        {
-            return null;
-        }
-
-        public int getDefaultEventIndex()
-        {
-            return 0;
-        }
-
-        public int getDefaultPropertyIndex()
-        {
-            return 0;
-        }
-
-        public EventSetDescriptor[] getEventSetDescriptors()
-        {
-            return new EventSetDescriptor[0];
-        }
-
-        public Image getIcon(int iconKind)
-        {
-            return null;
-        }
-
-        public MethodDescriptor[] getMethodDescriptors()
-        {
-            return new MethodDescriptor[0];
-        }
-
-        public PropertyDescriptor[] getPropertyDescriptors()
-        {
-            throw new RuntimeException("This is the UglyBean.");
-        }
-
-    }
-
-    public static class BooleanHolder
-    {
-        private boolean _flag;
-
-        public boolean isFlag()
-        {
-            return _flag;
-        }
-
-        public void setFlag(boolean flag)
-        {
-            _flag = flag;
-        }
-    }
-
-    @Test
-    public void simple_read_access()
-    {
-        Bean b = new Bean();
-
-        int value = _random.nextInt();
-
-        b.setValue(value);
-
-        assertEquals(_access.get(b, "value"), value);
-    }
-
-    @Test
-    public void simple_write_access()
-    {
-        Bean b = new Bean();
-
-        int value = _random.nextInt();
-
-        _access.set(b, "value", value);
-
-        assertEquals(b.getValue(), value);
-    }
-
-    @Test
-    public void missing_property()
-    {
-        Bean b = new Bean();
-
-        try
-        {
-            _access.get(b, "zaphod");
-
-            unreachable();
-        }
-        catch (IllegalArgumentException ex)
-        {
-            assertEquals(ex.getMessage(), "Class " + CLASS_NAME + "$Bean does not "
-                    + "contain a property named 'zaphod'.");
-        }
-    }
-
-    @Test
-    public void attempt_to_update_read_only_property()
-    {
-        Bean b = new Bean();
-
-        try
-        {
-            _access.set(b, "class", null);
-            unreachable();
-        }
-        catch (UnsupportedOperationException ex)
-        {
-            assertEquals(ex.getMessage(), "Class " + CLASS_NAME
-                    + "$Bean does not provide an mutator ('setter') method for property 'class'.");
-        }
-    }
-
-    @Test
-    public void attempt_to_read_from_write_only_property()
-    {
-        Bean b = new Bean();
-
-        try
-        {
-            _access.get(b, "writeOnly");
-            unreachable();
-        }
-        catch (UnsupportedOperationException ex)
-        {
-            assertEquals(
-                    ex.getMessage(),
-                    "Class "
-                            + CLASS_NAME
-                            + "$Bean does not provide an accessor ('getter') method for property 'writeOnly'.");
-        }
-    }
-
-    @Test
-    public void exception_thrown_inside_getter()
-    {
-        ExceptionBean b = new ExceptionBean();
-
-        try
-        {
-            _access.get(b, "failure");
-            unreachable();
-        }
-        catch (RuntimeException ex)
-        {
-            assertEquals(
-                    ex.getMessage(),
-                    "Error reading property 'failure' of PropertyUtilsExceptionBean: getFailure");
-        }
-    }
-
-    @Test
-    public void exception_thrown_inside_setter()
-    {
-        ExceptionBean b = new ExceptionBean();
-
-        try
-        {
-            _access.set(b, "failure", false);
-            unreachable();
-        }
-        catch (RuntimeException ex)
-        {
-            assertEquals(
-                    ex.getMessage(),
-                    "Error updating property 'failure' of PropertyUtilsExceptionBean: setFailure");
-        }
-    }
-
-    @Test
-    public void failure_when_introspecting_class()
-    {
-        UglyBean b = new UglyBean();
-
-        try
-        {
-            _access.get(b, "google");
-            unreachable();
-        }
-        catch (RuntimeException ex)
-        {
-            assertEquals(ex.getMessage(), "java.lang.RuntimeException: This is the UglyBean.");
-        }
-    }
-
-    @Test
-    public void clear_wipes_internal_cache()
-    {
-        ClassPropertyAdapter cpa1 = _access.getAdapter(Bean.class);
-        ClassPropertyAdapter cpa2 = _access.getAdapter(Bean.class);
-
-        assertSame(cpa2, cpa1);
-
-        _access.clearCache();
-
-        ClassPropertyAdapter cpa3 = _access.getAdapter(Bean.class);
-
-        assertNotSame(cpa3, cpa1);
-    }
-
-    @Test
-    public void class_property_adapter_toString()
-    {
-        ClassPropertyAdapter cpa = _access.getAdapter(Bean.class);
-
-        assertEquals(cpa.toString(), "<ClassPropertyAdaptor " + CLASS_NAME
-                + "$Bean : class, readOnly, value, writeOnly>");
-    }
-
-    @Test
-    public void property_adapter_read_only_property()
-    {
-        ClassPropertyAdapter cpa = _access.getAdapter(Bean.class);
-        PropertyAdapter pa = cpa.getPropertyAdapter("readOnly");
-
-        assertTrue(pa.isRead());
-        assertFalse(pa.isUpdate());
-
-        assertNull(pa.getWriteMethod());
-        assertEquals(pa.getReadMethod(), findMethod(Bean.class, "getReadOnly"));
-    }
-
-    @Test
-    public void property_adapter_write_only_property()
-    {
-        ClassPropertyAdapter cpa = _access.getAdapter(Bean.class);
-        PropertyAdapter pa = cpa.getPropertyAdapter("writeOnly");
-
-        assertFalse(pa.isRead());
-        assertTrue(pa.isUpdate());
-
-        assertEquals(pa.getWriteMethod(), findMethod(Bean.class, "setWriteOnly"));
-        assertNull(pa.getReadMethod());
-    }
-
-    @Test
-    public void class_property_adapter_returns_null_for_unknown_property()
-    {
-        ClassPropertyAdapter cpa = _access.getAdapter(Bean.class);
-
-        assertNull(cpa.getPropertyAdapter("google"));
-    }
-
-    @Test
-    public void access_to_property_type()
-    {
-        ClassPropertyAdapter cpa = _access.getAdapter(Bean.class);
-
-        assertEquals(cpa.getPropertyAdapter("value").getType(), int.class);
-        assertEquals(cpa.getPropertyAdapter("readOnly").getType(), String.class);
-        assertEquals(cpa.getPropertyAdapter("writeOnly").getType(), boolean.class);
-    }
-
-    @Test
-    public void property_names()
-    {
-        ClassPropertyAdapter cpa = _access.getAdapter(Bean.class);
-
-        assertEquals(cpa.getPropertyNames(), Arrays.asList("class", "readOnly", "value", "writeOnly"));
-    }
-
-    @Test
-    public void integration()
-    {
-        Registry registry = buildRegistry();
-
-        PropertyAccess pa = registry
-                .getService("tapestry.ioc.PropertyAccess", PropertyAccess.class);
-
-        Bean b = new Bean();
-
-        int value = _random.nextInt();
-
-        pa.set(b, "value", value);
-
-        assertEquals(b.getValue(), value);
-    }
-
-}
+package org.apache.tapestry.ioc.internal.services;
+
+import java.awt.Image;
+import java.beans.BeanDescriptor;
+import java.beans.BeanInfo;
+import java.beans.EventSetDescriptor;
+import java.beans.MethodDescriptor;
+import java.beans.PropertyDescriptor;
+import java.util.Arrays;
+import java.util.Random;
+
+import org.apache.tapestry.ioc.Registry;
+import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
+import org.apache.tapestry.ioc.services.PropertyAccess;
+import org.apache.tapestry.ioc.services.PropertyAdapter;
+import org.testng.annotations.Test;
+
+public class PropertyAccessImplTest extends IOCInternalTestCase
+{
+    private static final String CLASS_NAME = PropertyAccessImplTest.class.getName();
+
+    private PropertyAccess _access = new PropertyAccessImpl();
+
+    private Random _random = new Random();
+
+    public static class Bean
+    {
+        private int _value;
+
+        public int getValue()
+        {
+            return _value;
+        }
+
+        public void setValue(int value)
+        {
+            _value = value;
+        }
+
+        @Override
+        public String toString()
+        {
+            return "PropertyUtilsTestBean";
+        }
+
+        public void setWriteOnly(boolean b)
+        {
+        }
+
+        public String getReadOnly()
+        {
+            return null;
+        }
+    }
+
+    public static class ExceptionBean
+    {
+        public boolean getFailure()
+        {
+            throw new RuntimeException("getFailure");
+        }
+
+        public void setFailure(boolean b)
+        {
+            throw new RuntimeException("setFailure");
+        }
+
+        @Override
+        public String toString()
+        {
+            return "PropertyUtilsExceptionBean";
+        }
+    }
+
+    public static class UglyBean
+    {
+    }
+
+    public static class UglyBeanBeanInfo implements BeanInfo
+    {
+
+        public BeanInfo[] getAdditionalBeanInfo()
+        {
+            return new BeanInfo[0];
+        }
+
+        public BeanDescriptor getBeanDescriptor()
+        {
+            return null;
+        }
+
+        public int getDefaultEventIndex()
+        {
+            return 0;
+        }
+
+        public int getDefaultPropertyIndex()
+        {
+            return 0;
+        }
+
+        public EventSetDescriptor[] getEventSetDescriptors()
+        {
+            return new EventSetDescriptor[0];
+        }
+
+        public Image getIcon(int iconKind)
+        {
+            return null;
+        }
+
+        public MethodDescriptor[] getMethodDescriptors()
+        {
+            return new MethodDescriptor[0];
+        }
+
+        public PropertyDescriptor[] getPropertyDescriptors()
+        {
+            throw new RuntimeException("This is the UglyBean.");
+        }
+
+    }
+
+    public static class BooleanHolder
+    {
+        private boolean _flag;
+
+        public boolean isFlag()
+        {
+            return _flag;
+        }
+
+        public void setFlag(boolean flag)
+        {
+            _flag = flag;
+        }
+    }
+
+    @Test
+    public void simple_read_access()
+    {
+        Bean b = new Bean();
+
+        int value = _random.nextInt();
+
+        b.setValue(value);
+
+        assertEquals(_access.get(b, "value"), value);
+    }
+
+    @Test
+    public void simple_write_access()
+    {
+        Bean b = new Bean();
+
+        int value = _random.nextInt();
+
+        _access.set(b, "value", value);
+
+        assertEquals(b.getValue(), value);
+    }
+
+    @Test
+    public void missing_property()
+    {
+        Bean b = new Bean();
+
+        try
+        {
+            _access.get(b, "zaphod");
+
+            unreachable();
+        }
+        catch (IllegalArgumentException ex)
+        {
+            assertEquals(ex.getMessage(), "Class " + CLASS_NAME + "$Bean does not "
+                    + "contain a property named 'zaphod'.");
+        }
+    }
+
+    @Test
+    public void attempt_to_update_read_only_property()
+    {
+        Bean b = new Bean();
+
+        try
+        {
+            _access.set(b, "class", null);
+            unreachable();
+        }
+        catch (UnsupportedOperationException ex)
+        {
+            assertEquals(ex.getMessage(), "Class " + CLASS_NAME
+                    + "$Bean does not provide an mutator ('setter') method for property 'class'.");
+        }
+    }
+
+    @Test
+    public void attempt_to_read_from_write_only_property()
+    {
+        Bean b = new Bean();
+
+        try
+        {
+            _access.get(b, "writeOnly");
+            unreachable();
+        }
+        catch (UnsupportedOperationException ex)
+        {
+            assertEquals(
+                    ex.getMessage(),
+                    "Class "
+                            + CLASS_NAME
+                            + "$Bean does not provide an accessor ('getter') method for property 'writeOnly'.");
+        }
+    }
+
+    @Test
+    public void exception_thrown_inside_getter()
+    {
+        ExceptionBean b = new ExceptionBean();
+
+        try
+        {
+            _access.get(b, "failure");
+            unreachable();
+        }
+        catch (RuntimeException ex)
+        {
+            assertEquals(
+                    ex.getMessage(),
+                    "Error reading property 'failure' of PropertyUtilsExceptionBean: getFailure");
+        }
+    }
+
+    @Test
+    public void exception_thrown_inside_setter()
+    {
+        ExceptionBean b = new ExceptionBean();
+
+        try
+        {
+            _access.set(b, "failure", false);
+            unreachable();
+        }
+        catch (RuntimeException ex)
+        {
+            assertEquals(
+                    ex.getMessage(),
+                    "Error updating property 'failure' of PropertyUtilsExceptionBean: setFailure");
+        }
+    }
+
+    @Test
+    public void failure_when_introspecting_class()
+    {
+        UglyBean b = new UglyBean();
+
+        try
+        {
+            _access.get(b, "google");
+            unreachable();
+        }
+        catch (RuntimeException ex)
+        {
+            assertEquals(ex.getMessage(), "java.lang.RuntimeException: This is the UglyBean.");
+        }
+    }
+
+    @Test
+    public void clear_wipes_internal_cache()
+    {
+        ClassPropertyAdapter cpa1 = _access.getAdapter(Bean.class);
+        ClassPropertyAdapter cpa2 = _access.getAdapter(Bean.class);
+
+        assertSame(cpa2, cpa1);
+
+        _access.clearCache();
+
+        ClassPropertyAdapter cpa3 = _access.getAdapter(Bean.class);
+
+        assertNotSame(cpa3, cpa1);
+    }
+
+    @Test
+    public void class_property_adapter_toString()
+    {
+        ClassPropertyAdapter cpa = _access.getAdapter(Bean.class);
+
+        assertEquals(cpa.toString(), "<ClassPropertyAdaptor " + CLASS_NAME
+                + "$Bean : class, readOnly, value, writeOnly>");
+    }
+
+    @Test
+    public void property_adapter_read_only_property()
+    {
+        ClassPropertyAdapter cpa = _access.getAdapter(Bean.class);
+        PropertyAdapter pa = cpa.getPropertyAdapter("readOnly");
+
+        assertTrue(pa.isRead());
+        assertFalse(pa.isUpdate());
+
+        assertNull(pa.getWriteMethod());
+        assertEquals(pa.getReadMethod(), findMethod(Bean.class, "getReadOnly"));
+    }
+
+    @Test
+    public void property_adapter_write_only_property()
+    {
+        ClassPropertyAdapter cpa = _access.getAdapter(Bean.class);
+        PropertyAdapter pa = cpa.getPropertyAdapter("writeOnly");
+
+        assertFalse(pa.isRead());
+        assertTrue(pa.isUpdate());
+
+        assertEquals(pa.getWriteMethod(), findMethod(Bean.class, "setWriteOnly"));
+        assertNull(pa.getReadMethod());
+    }
+
+    @Test
+    public void class_property_adapter_returns_null_for_unknown_property()
+    {
+        ClassPropertyAdapter cpa = _access.getAdapter(Bean.class);
+
+        assertNull(cpa.getPropertyAdapter("google"));
+    }
+
+    @Test
+    public void access_to_property_type()
+    {
+        ClassPropertyAdapter cpa = _access.getAdapter(Bean.class);
+
+        assertEquals(cpa.getPropertyAdapter("value").getType(), int.class);
+        assertEquals(cpa.getPropertyAdapter("readOnly").getType(), String.class);
+        assertEquals(cpa.getPropertyAdapter("writeOnly").getType(), boolean.class);
+    }
+
+    @Test
+    public void property_names()
+    {
+        ClassPropertyAdapter cpa = _access.getAdapter(Bean.class);
+
+        assertEquals(cpa.getPropertyNames(), Arrays.asList(
+                "class",
+                "readOnly",
+                "value",
+                "writeOnly"));
+    }
+
+    @Test
+    public void integration()
+    {
+        Registry registry = buildRegistry();
+
+        PropertyAccess pa = registry
+                .getService("tapestry.ioc.PropertyAccess", PropertyAccess.class);
+
+        Bean b = new Bean();
+
+        int value = _random.nextInt();
+
+        pa.set(b, "value", value);
+
+        assertEquals(b.getValue(), value);
+    }
+
+}

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImplTest.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImplTest.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImplTest.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImplTest.java&r2=477910
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImplTest.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImplTest.java Tue Nov 21 13:48:47 2006
@@ -14,18 +14,15 @@
 
 package org.apache.tapestry.ioc.internal.services;
 
-import static org.easymock.EasyMock.contains;
-import static org.easymock.EasyMock.same;
+import static org.easymock.EasyMock.contains;
+import static org.easymock.EasyMock.same;
+
+import org.apache.commons.logging.Log;
+import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry.ioc.services.RegistryShutdownListener;
+import org.testng.annotations.Test;
 
-import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.services.RegistryShutdownListener;
-import org.testng.annotations.Test;
-
-/**
- * 
- */
-public class RegistryShutdownHubImplTest extends InternalBaseTestCase
+public class RegistryShutdownHubImplTest extends IOCInternalTestCase
 {
 
     @Test

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleFilter.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleFilter.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleFilter.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleFilter.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleFilter.java&r2=477910
==============================================================================
    (empty)

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleFilter.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleFilter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleService.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleService.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleService.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleService.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleService.java&r2=477910
==============================================================================
    (empty)

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleService.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SampleService.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java&r2=477910
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java Tue Nov 21 13:48:47 2006
@@ -12,171 +12,168 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.ioc.internal.services;
-
-import java.util.Arrays;
-
-import org.apache.commons.logging.Log;
-import org.apache.tapestry.ioc.services.ExceptionTracker;
-import org.apache.tapestry.test.TapestryTestCase;
-import org.testng.annotations.Test;
-
-/**
- * 
- */
-public class ServiceLoggerTest extends TapestryTestCase
-{
-    private void try_entry(String methodName, String expected, Object... arguments)
-    {
-        Log log = newLog();
-        ExceptionTracker tracker = newExceptionTracker();
-
-        log.debug("[ENTER] " + expected);
-
-        replay();
-
-        new ServiceLogger(log, tracker).entry(methodName, arguments);
-
-        verify();
-
-    }
-
-    protected final ExceptionTracker newExceptionTracker()
-    {
-        return newMock(ExceptionTracker.class);
-    }
-
-    private void try_exit(String methodName, String expected, Object result)
-    {
-        Log log = newLog();
-        ExceptionTracker tracker = newExceptionTracker();
-
-        log.debug("[ EXIT] " + expected);
-
-        replay();
-
-        new ServiceLogger(log, tracker).exit(methodName, result);
-
-        verify();
-    }
-
-    @Test
-    public void entry_tests()
-    {
-        try_entry("fred", "fred()");
-        try_entry("barney", "barney(\"rubble\")", "rubble");
-        try_entry("yogi", "yogi(null, null)", null, null);
-        try_entry("wilma", "wilma(1, 2, 3)", 1, 2, 3);
-        try_entry("betty", "betty(\"rubble\", {1, 2, 3, \"four\"})", "rubble", new Object[]
-        { 1, 2, 3, "four" });
-        try_entry("betty", "betty(\"rubble\", [1, 2, 3, \"four\", [5, 6]])", "rubble", Arrays
-                .asList(1, 2, 3, "four", Arrays.asList(5, 6)));
-    }
-
-    @Test
-    public void exit_test()
-    {
-        try_exit("fred", "fred [true]", true);
-        try_exit("barney", "barney [\"rubble\"]", "rubble");
-    }
-
-    @Test
-    public void void_exit_test()
-    {
-        Log log = newLog();
-        ExceptionTracker tracker = newExceptionTracker();
-
-        log.debug("[ EXIT] wilma");
-
-        replay();
-
-        new ServiceLogger(log, tracker).voidExit("wilma");
-
-        verify();
-    }
-
-    @Test
-    public void fail_test_exception_not_already_logged()
-    {
-        Log log = newLog();
-        ExceptionTracker tracker = newExceptionTracker();
-
-        RuntimeException t = new RuntimeException("Ouch!");
-
-        train_isDebugEnabled(log, true);
-
-        train_exceptionLogged(tracker, t, false);
-
-        log.debug("[ FAIL] wilma -- " + t.getClass().getName(), t);
-
-        replay();
-
-        new ServiceLogger(log, tracker).fail("wilma", t);
-
-        verify();
-    }
-
-    @Test
-    public void fail_test_exception_previously_logged()
-    {
-        Log log = newLog();
-        ExceptionTracker tracker = newExceptionTracker();
-
-        RuntimeException t = new RuntimeException("Ouch!");
-
-        train_isDebugEnabled(log, true);
-
-        train_exceptionLogged(tracker, t, true);
-
-        log.debug("[ FAIL] wilma -- " + t.getClass().getName(), null);
-
-        replay();
-
-        new ServiceLogger(log, tracker).fail("wilma", t);
-
-        verify();
-    }
-
-    @Test
-    public void fail_debug_not_enabled()
-    {
-        Log log = newLog();
-        ExceptionTracker tracker = newExceptionTracker();
-
-        RuntimeException t = new RuntimeException("Ouch!");
-
-        train_isDebugEnabled(log, false);
-
-        replay();
-
-        new ServiceLogger(log, tracker).fail("wilma", t);
-
-        verify();
-    }
-
-    private void train_exceptionLogged(ExceptionTracker tracker, Throwable exception, boolean logged)
-    {
-        tracker.exceptionLogged(exception);
-        setReturnValue(logged);
-
-    }
-
-    @Test
-    public void debug_enabled()
-    {
-        Log log = newLog();
-        ExceptionTracker tracker = newExceptionTracker();
-
-        train_isDebugEnabled(log, true);
-        train_isDebugEnabled(log, false);
-
-        replay();
-
-        ServiceLogger logger = new ServiceLogger(log, tracker);
-
-        assertTrue(logger.isDebugEnabled());
-        assertFalse(logger.isDebugEnabled());
-
-        verify();
-    }
+package org.apache.tapestry.ioc.internal.services;
+
+import java.util.Arrays;
+
+import org.apache.commons.logging.Log;
+import org.apache.tapestry.ioc.services.ExceptionTracker;
+import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.testng.annotations.Test;
+
+public class ServiceLoggerTest extends IOCTestCase
+{
+    private void try_entry(String methodName, String expected, Object... arguments)
+    {
+        Log log = newLog();
+        ExceptionTracker tracker = newExceptionTracker();
+
+        log.debug("[ENTER] " + expected);
+
+        replay();
+
+        new ServiceLogger(log, tracker).entry(methodName, arguments);
+
+        verify();
+
+    }
+
+    protected final ExceptionTracker newExceptionTracker()
+    {
+        return newMock(ExceptionTracker.class);
+    }
+
+    private void try_exit(String methodName, String expected, Object result)
+    {
+        Log log = newLog();
+        ExceptionTracker tracker = newExceptionTracker();
+
+        log.debug("[ EXIT] " + expected);
+
+        replay();
+
+        new ServiceLogger(log, tracker).exit(methodName, result);
+
+        verify();
+    }
+
+    @Test
+    public void entry_tests()
+    {
+        try_entry("fred", "fred()");
+        try_entry("barney", "barney(\"rubble\")", "rubble");
+        try_entry("yogi", "yogi(null, null)", null, null);
+        try_entry("wilma", "wilma(1, 2, 3)", 1, 2, 3);
+        try_entry("betty", "betty(\"rubble\", {1, 2, 3, \"four\"})", "rubble", new Object[]
+        { 1, 2, 3, "four" });
+        try_entry("betty", "betty(\"rubble\", [1, 2, 3, \"four\", [5, 6]])", "rubble", Arrays
+                .asList(1, 2, 3, "four", Arrays.asList(5, 6)));
+    }
+
+    @Test
+    public void exit_test()
+    {
+        try_exit("fred", "fred [true]", true);
+        try_exit("barney", "barney [\"rubble\"]", "rubble");
+    }
+
+    @Test
+    public void void_exit_test()
+    {
+        Log log = newLog();
+        ExceptionTracker tracker = newExceptionTracker();
+
+        log.debug("[ EXIT] wilma");
+
+        replay();
+
+        new ServiceLogger(log, tracker).voidExit("wilma");
+
+        verify();
+    }
+
+    @Test
+    public void fail_test_exception_not_already_logged()
+    {
+        Log log = newLog();
+        ExceptionTracker tracker = newExceptionTracker();
+
+        RuntimeException t = new RuntimeException("Ouch!");
+
+        train_isDebugEnabled(log, true);
+
+        train_exceptionLogged(tracker, t, false);
+
+        log.debug("[ FAIL] wilma -- " + t.getClass().getName(), t);
+
+        replay();
+
+        new ServiceLogger(log, tracker).fail("wilma", t);
+
+        verify();
+    }
+
+    @Test
+    public void fail_test_exception_previously_logged()
+    {
+        Log log = newLog();
+        ExceptionTracker tracker = newExceptionTracker();
+
+        RuntimeException t = new RuntimeException("Ouch!");
+
+        train_isDebugEnabled(log, true);
+
+        train_exceptionLogged(tracker, t, true);
+
+        log.debug("[ FAIL] wilma -- " + t.getClass().getName(), null);
+
+        replay();
+
+        new ServiceLogger(log, tracker).fail("wilma", t);
+
+        verify();
+    }
+
+    @Test
+    public void fail_debug_not_enabled()
+    {
+        Log log = newLog();
+        ExceptionTracker tracker = newExceptionTracker();
+
+        RuntimeException t = new RuntimeException("Ouch!");
+
+        train_isDebugEnabled(log, false);
+
+        replay();
+
+        new ServiceLogger(log, tracker).fail("wilma", t);
+
+        verify();
+    }
+
+    private void train_exceptionLogged(ExceptionTracker tracker, Throwable exception, boolean logged)
+    {
+        tracker.exceptionLogged(exception);
+        setReturnValue(logged);
+
+    }
+
+    @Test
+    public void debug_enabled()
+    {
+        Log log = newLog();
+        ExceptionTracker tracker = newExceptionTracker();
+
+        train_isDebugEnabled(log, true);
+        train_isDebugEnabled(log, false);
+
+        replay();
+
+        ServiceLogger logger = new ServiceLogger(log, tracker);
+
+        assertTrue(logger.isDebugEnabled());
+        assertFalse(logger.isDebugEnabled());
+
+        verify();
+    }
 }

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceObjectProviderTest.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceObjectProviderTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceObjectProviderTest.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceObjectProviderTest.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceObjectProviderTest.java&r2=477910
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceObjectProviderTest.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceObjectProviderTest.java Tue Nov 21 13:48:47 2006
@@ -14,15 +14,12 @@
 
 package org.apache.tapestry.ioc.internal.services;
 
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.ServiceLocator;
-import org.testng.annotations.Test;
+import org.apache.tapestry.ioc.ObjectProvider;
+import org.apache.tapestry.ioc.ServiceLocator;
+import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
+import org.testng.annotations.Test;
 
-/**
- * 
- */
-public class ServiceObjectProviderTest extends InternalBaseTestCase
+public class ServiceObjectProviderTest extends IOCInternalTestCase
 {
     @Test
     public void provider_delegates_to_locator()

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SimpleService.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SimpleService.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SimpleService.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SimpleService.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SimpleService.java&r2=477910
==============================================================================
    (empty)

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SimpleService.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.5

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SimpleService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/SimpleService.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardFilter.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardFilter.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardFilter.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardFilter.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardFilter.java&r2=477910
==============================================================================
    (empty)

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardFilter.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardFilter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardService.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardService.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardService.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardService.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardService.java&r2=477910
==============================================================================
    (empty)

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardService.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StandardService.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.java&r2=477910
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.java Tue Nov 21 13:48:47 2006
@@ -20,12 +20,12 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
 import org.apache.tapestry.ioc.services.StrategyBuilder;
 import org.apache.tapestry.ioc.util.StrategyRegistry;
 import org.testng.annotations.Test;
 
-public class StrategyBuilderImplTest extends InternalBaseTestCase
+public class StrategyBuilderImplTest extends IOCInternalTestCase
 {
     private static class KindOfImpl implements KindOf
     {

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ThreadCleanupHubImplTest.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ThreadCleanupHubImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ThreadCleanupHubImplTest.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ThreadCleanupHubImplTest.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ThreadCleanupHubImplTest.java&r2=477910
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ThreadCleanupHubImplTest.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ThreadCleanupHubImplTest.java Tue Nov 21 13:48:47 2006
@@ -12,112 +12,109 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.ioc.internal.services;
-
-import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.services.ThreadCleanupListener;
-import org.testng.annotations.Test;
-
-/**
- * 
- */
-public class ThreadCleanupHubImplTest extends InternalBaseTestCase
-{
-    @Test
-    public void no_listeners()
-    {
-        Log log = newLog();
-
-        replay();
-
-        new ThreadCleanupHubImpl(log).cleanup();
-
-        verify();
-    }
-
-    @Test
-    public void listeners_are_one_shot()
-    {
-        Log log = newLog();
-        ThreadCleanupListener listener = newThreadCleanupListener();
-
-        listener.threadDidCleanup();
-
-        replay();
-
-        ThreadCleanupHubImpl hub = new ThreadCleanupHubImpl(log);
-
-        hub.addThreadCleanupListener(listener);
-
-        hub.cleanup();
-
-        verify();
-
-        // No more training.
-
-        replay();
-
-        // Listener not invoked.
-
-        hub.cleanup();
-
-        verify();
-    }
-
-    private ThreadCleanupListener newThreadCleanupListener()
-    {
-        return newMock(ThreadCleanupListener.class);
-    }
-
-    @Test
-    public void listener_cleanup_failure()
-    {
-        final RuntimeException t = new RuntimeException("Boom!");
-
-        Log log = newLog();
-
-        ThreadCleanupListener listener = new ThreadCleanupListener()
-        {
-
-            public void threadDidCleanup()
-            {
-                throw t;
-            }
-
-        };
-
-        log.warn(ServiceMessages.threadCleanupError(listener, t), t);
-
-        replay();
-
-        ThreadCleanupHubImpl hub = new ThreadCleanupHubImpl(log);
-
-        hub.addThreadCleanupListener(listener);
-
-        hub.cleanup();
-
-        verify();
-    }
-
-    // @Test
-    // public void listener_list_is_per_thread()
-    // {
-    // ThreadCleanupListener l1 = newThreadCleanupListener();
-    // final ThreadCleanupListener l2 = newThreadCleanupListener();
-    //
-    // Thread thread = new Thread();
-    //
-    // l1.threadDidCleanup();
-    //
-    // replay();
-    //
-    // final ThreadCleanupHub hub = new ThreadCleanupHubImpl(log);
-    //
-    // hub.addThreadCleanupListener(l1);
-    //
-    // hub.cleanup();
-    //
-    // verify();
-    // }
-}
+package org.apache.tapestry.ioc.internal.services;
+
+import org.apache.commons.logging.Log;
+import org.apache.tapestry.ioc.services.ThreadCleanupListener;
+import org.apache.tapestry.ioc.test.TestBase;
+import org.testng.annotations.Test;
+
+public class ThreadCleanupHubImplTest extends TestBase
+{
+    @Test
+    public void no_listeners()
+    {
+        Log log = newLog();
+
+        replay();
+
+        new ThreadCleanupHubImpl(log).cleanup();
+
+        verify();
+    }
+
+    @Test
+    public void listeners_are_one_shot()
+    {
+        Log log = newLog();
+        ThreadCleanupListener listener = newThreadCleanupListener();
+
+        listener.threadDidCleanup();
+
+        replay();
+
+        ThreadCleanupHubImpl hub = new ThreadCleanupHubImpl(log);
+
+        hub.addThreadCleanupListener(listener);
+
+        hub.cleanup();
+
+        verify();
+
+        // No more training.
+
+        replay();
+
+        // Listener not invoked.
+
+        hub.cleanup();
+
+        verify();
+    }
+
+    private ThreadCleanupListener newThreadCleanupListener()
+    {
+        return newMock(ThreadCleanupListener.class);
+    }
+
+    @Test
+    public void listener_cleanup_failure()
+    {
+        final RuntimeException t = new RuntimeException("Boom!");
+
+        Log log = newLog();
+
+        ThreadCleanupListener listener = new ThreadCleanupListener()
+        {
+
+            public void threadDidCleanup()
+            {
+                throw t;
+            }
+
+        };
+
+        log.warn(ServiceMessages.threadCleanupError(listener, t), t);
+
+        replay();
+
+        ThreadCleanupHubImpl hub = new ThreadCleanupHubImpl(log);
+
+        hub.addThreadCleanupListener(listener);
+
+        hub.cleanup();
+
+        verify();
+    }
+
+    // @Test
+    // public void listener_list_is_per_thread()
+    // {
+    // ThreadCleanupListener l1 = newThreadCleanupListener();
+    // final ThreadCleanupListener l2 = newThreadCleanupListener();
+    //
+    // Thread thread = new Thread();
+    //
+    // l1.threadDidCleanup();
+    //
+    // replay();
+    //
+    // final ThreadCleanupHub hub = new ThreadCleanupHubImpl(log);
+    //
+    // hub.addThreadCleanupListener(l1);
+    //
+    // hub.cleanup();
+    //
+    // verify();
+    // }
+}

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringFilter.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringFilter.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringFilter.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringFilter.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringFilter.java&r2=477910
==============================================================================
    (empty)

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringFilter.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringFilter.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringService.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringService.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringService.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringService.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringService.java&r2=477910
==============================================================================
    (empty)

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringService.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.2

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/ToStringService.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java&r2=477910
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java Tue Nov 21 13:48:47 2006
@@ -12,141 +12,143 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.ioc.internal.services;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-public class TypeCoercerImplTest extends InternalBaseTestCase
-{
-    private TypeCoercer _coercer;
-
-    @BeforeClass
-    public void setup_coercer()
-    {
-        _coercer = getObject("infrastructure:typeCoercer", TypeCoercer.class);
-    }
-
-    @AfterClass
-    public void cleanup_coercer()
-    {
-        _coercer = null;
-    }
-
-    @Test
-    public void builtin_coercion()
-    {
-        // String to Double
-
-        assertEquals(_coercer.coerce("-15", Double.class), new Double(-15));
-
-        // Now a second pass through, to exercise the internal cache
-
-        assertEquals(_coercer.coerce("2.27", Double.class), new Double(2.27));
-    }
-
-    @Test
-    public void primitive_type_as_target()
-    {
-        assertEquals(_coercer.coerce(227l, int.class), new Integer(227));
-    }
-
-    @Test
-    public void no_coercion_necessary()
-    {
-        Object input = new Integer(-37);
-
-        assertSame(_coercer.coerce(input, Number.class), input);
-    }
-
-    @Test
-    public void combined_coercion()
-    {
-        StringBuilder builder = new StringBuilder("12345");
-
-        // This should trigger Object -> String, String -> Integer
-
-        assertEquals(_coercer.coerce(builder, int.class), new Integer(12345));
-
-        // This should trigger String -> Double, Number -> Integer
-
-        assertEquals(_coercer.coerce("52", Integer.class), new Integer(52));
-    }
-
-    @Test
-    public void coercion_failure()
-    {
-        try
-        {
-            _coercer.coerce("", Map.class);
-            unreachable();
-        }
-        catch (IllegalArgumentException ex)
-        {
-            assertTrue(ex.getMessage().contains(
-                    "Could not find a coercion from type java.lang.String to type java.util.Map"));
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test(dataProvider = "coercions_inputs")
-    public void builtin_coercions(Object input, Class targetType, Object expected)
-    {
-        assertEquals(_coercer.coerce(input, targetType), expected);
-    }
-
-    @DataProvider(name = "coercions_inputs")
-    public Object[][] coercions_inputs()
-    {
-        String bigDecimalValue = "12345656748352435842385234598234958234574358723485.35843534285293857298457234587";
-        String bigIntegerValue = "12384584574874385743";
-
-        Object object = new Object();
-        // Over time, some of these may evolve from testing specific tuples to
-        // compound tuples (built around specific tuples).
-
-        return new Object[][]
-        {
-        // There's a lot of these!
-
-                { this, String.class, toString() }, 
-                { 55l, Integer.class, 55 }, 
-                { "", Boolean.class, false }, 
-                { "  ", Boolean.class, false },
-                { "x", Boolean.class, true },
-                { " z ", Boolean.class, true },
-                { "false", Boolean.class, false },
-                { "  False ", Boolean.class, false },
-                { null, Boolean.class, false },
-                { new Double(256), Integer.class, new Integer(256) }, 
-                { new Double(22.7), Integer.class, new Integer(22) },
-                { new Integer(0), Boolean.class, false }, 
-                { new Long(32838), Boolean.class, true },
-                { new Integer(127), Byte.class, new Byte("127") }, 
-                { new Double(58), Short.class, new Short("58") }, 
-                { new Integer(33), Long.class, new Long(33) }, 
-                { new Integer(22), Float.class, new Float(22) }, 
-                { new Integer(1234), Double.class, new Double(1234) }, 
-                { Collections.EMPTY_LIST, Boolean.class, false }, 
-                { Collections.singleton(this), Boolean.class, true },
-                { bigDecimalValue, BigDecimal.class, new BigDecimal(bigDecimalValue) }, 
-                { new BigDecimal(bigDecimalValue), Double.class, 1.2345656748352436E49 }, 
-                { bigIntegerValue, BigInteger.class, new BigInteger(bigIntegerValue) },
-                { new BigInteger("12345678"), Long.class, 12345678l },
-                { -12345678l, BigInteger.class, new BigInteger("-12345678") },
-                { object, List.class, Collections.singletonList(object) },
-                { null, String.class, null },
-
-        };
-    }
-}
+package org.apache.tapestry.ioc.internal.services;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry.ioc.services.TypeCoercer;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+public class TypeCoercerImplTest extends IOCInternalTestCase
+{
+    private TypeCoercer _coercer;
+
+    @BeforeClass
+    public void setup_coercer()
+    {
+        _coercer = getService(TypeCoercer.class);
+    }
+
+    @AfterClass
+    public void cleanup_coercer()
+    {
+        _coercer = null;
+    }
+
+    @Test
+    public void builtin_coercion()
+    {
+        // String to Double
+
+        assertEquals(_coercer.coerce("-15", Double.class), new Double(-15));
+
+        // Now a second pass through, to exercise the internal cache
+
+        assertEquals(_coercer.coerce("2.27", Double.class), new Double(2.27));
+    }
+
+    @Test
+    public void primitive_type_as_target()
+    {
+        assertEquals(_coercer.coerce(227l, int.class), new Integer(227));
+    }
+
+    @Test
+    public void no_coercion_necessary()
+    {
+        Object input = new Integer(-37);
+
+        assertSame(_coercer.coerce(input, Number.class), input);
+    }
+
+    @Test
+    public void combined_coercion()
+    {
+        StringBuilder builder = new StringBuilder("12345");
+
+        // This should trigger Object -> String, String -> Integer
+
+        assertEquals(_coercer.coerce(builder, int.class), new Integer(12345));
+
+        // This should trigger String -> Double, Number -> Integer
+
+        assertEquals(_coercer.coerce("52", Integer.class), new Integer(52));
+    }
+
+    @Test
+    public void coercion_failure()
+    {
+        try
+        {
+            _coercer.coerce("", Map.class);
+            unreachable();
+        }
+        catch (IllegalArgumentException ex)
+        {
+            assertTrue(ex.getMessage().contains(
+                    "Could not find a coercion from type java.lang.String to type java.util.Map"));
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test(dataProvider = "coercions_inputs")
+    public void builtin_coercions(Object input, Class targetType, Object expected)
+    {
+        Object actual = _coercer.coerce(input, targetType);
+        
+        assertEquals(actual, expected);
+    }
+
+    @DataProvider(name = "coercions_inputs")
+    public Object[][] coercions_inputs()
+    {
+        String bigDecimalValue = "12345656748352435842385234598234958234574358723485.35843534285293857298457234587";
+        String bigIntegerValue = "12384584574874385743";
+
+        Object object = new Object();
+        // Over time, some of these may evolve from testing specific tuples to
+        // compound tuples (built around specific tuples).
+
+        return new Object[][]
+        {
+        // There's a lot of these!
+
+                { this, String.class, toString() },
+                { 55l, Integer.class, 55 },
+                { "", Boolean.class, false },
+                { "  ", Boolean.class, false },
+                { "x", Boolean.class, true },
+                { " z ", Boolean.class, true },
+                { "false", Boolean.class, false },
+                { "  False ", Boolean.class, false },
+                { null, Boolean.class, false },
+                { new Double(256), Integer.class, new Integer(256) },
+                { new Double(22.7), Integer.class, new Integer(22) },
+                { new Integer(0), Boolean.class, false },
+                { new Long(32838), Boolean.class, true },
+                { new Integer(127), Byte.class, new Byte("127") },
+                { new Double(58), Short.class, new Short("58") },
+                { new Integer(33), Long.class, new Long(33) },
+                { new Integer(22), Float.class, new Float(22) },
+                { new Integer(1234), Double.class, new Double(1234) },
+                { Collections.EMPTY_LIST, Boolean.class, false },
+                { Collections.singleton(this), Boolean.class, true },
+                { bigDecimalValue, BigDecimal.class, new BigDecimal(bigDecimalValue) },
+                { new BigDecimal(bigDecimalValue), Double.class, 1.2345656748352436E49 },
+                { bigIntegerValue, BigInteger.class, new BigInteger(bigIntegerValue) },
+                { new BigInteger("12345678"), Long.class, 12345678l },
+                { -12345678l, BigInteger.class, new BigInteger("-12345678") },
+                { object, List.class, Collections.singletonList(object) },
+                { null, String.class, null },
+
+        };
+    }
+}

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/CollectionFactoryTest.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/CollectionFactoryTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/CollectionFactoryTest.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/CollectionFactoryTest.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/CollectionFactoryTest.java&r2=477910
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/CollectionFactoryTest.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/CollectionFactoryTest.java Tue Nov 21 13:48:47 2006
@@ -12,147 +12,140 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.util;
-
-import static java.util.Arrays.asList;
+package org.apache.tapestry.ioc.internal.util;
+
+import static java.util.Arrays.asList;
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotSame;
-import static org.testng.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.testng.annotations.Test;
-
-/**
- * 
- */
-public class CollectionFactoryTest
-{
-
-    @Test
-    public void new_map()
-    {
-        Map<String, Class> map = newMap();
-
-        assertTrue(map instanceof HashMap);
-    }
-
-    @Test
-    public void copy_map()
-    {
-        Map<String, Class> map = newMap();
-
-        map.put("this", CollectionFactoryTest.class);
-
-        Map<String, Class> copy = CollectionFactory.newMap(map);
-
-        assertEquals(copy, map);
-
-        map.put("other", Map.class);
-
-        assertFalse(copy.equals(map));
-    }
-
-    @Test
-    public void new_set()
-    {
-        Set<String> set = newSet();
-
-        assertTrue(set instanceof HashSet);
-    }
-
-    @Test
-    public void copy_set()
-    {
-        List<String> start = asList("fred", "barney");
-
-        Set<String> set = newSet(start);
-
-        assertEquals(set.size(), 2);
-        assertTrue(set.contains("fred"));
-        assertTrue(set.contains("barney"));
-    }
-
-    @Test
-    public void set_from_varargs()
-    {
-        Set<String> set = newSet("fred", "barney");
-
-        assertEquals(set.size(), 2);
-        assertTrue(set.contains("fred"));
-        assertTrue(set.contains("barney"));
-    }
-
-    @Test
-    public void new_list()
-    {
-        List<String> list = newList();
-
-        assertTrue(list instanceof ArrayList);
-    }
-
-    @Test
-    public void new_list_copy()
-    {
-        List<String> start = Arrays.asList("Fred", "Barney", "Wilma");
-        List<String> copy = newList(start);
-
-        assertNotSame(copy, start);
-        assertEquals(copy, start);
-    }
-
-    private static final int THREAD_COUNT = 20;
-
-    @Test
-    public void new_threadsafe_list() throws Exception
-    {
-        final List<String> threadNames = CollectionFactory.newThreadSafeList();
-
-        List<Thread> threads = CollectionFactory.newList();
-
-        Runnable r = new Runnable()
-        {
-            public void run()
-            {
-                String name = Thread.currentThread().getName();
-                threadNames.add(name);
-            }
-        };
-
-        for (int i = 0; i < THREAD_COUNT; i++)
-        {
-            Thread t = new Thread(r);
-            threads.add(t);
-        }
-
-        // Start all the threads at the same time.
-
-        for (Thread t : threads)
-        {
-            t.start();
-        }
-
-        // Wait for all threads to complete
-
-        for (Thread t : threads)
-        {
-            t.join();
-        }
-
-        // Make sure they all executed. If the list was not thread safe, highly unlikely this
-        // would work.
-
-        assertEquals(threadNames.size(), THREAD_COUNT);
-    }
-}
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class CollectionFactoryTest extends Assert
+{
+
+    @Test
+    public void new_map()
+    {
+        Map<String, Class> map = newMap();
+
+        assertTrue(map instanceof HashMap);
+    }
+
+    @Test
+    public void copy_map()
+    {
+        Map<String, Class> map = newMap();
+
+        map.put("this", CollectionFactoryTest.class);
+
+        Map<String, Class> copy = CollectionFactory.newMap(map);
+
+        assertEquals(copy, map);
+
+        map.put("other", Map.class);
+
+        assertFalse(copy.equals(map));
+    }
+
+    @Test
+    public void new_set()
+    {
+        Set<String> set = newSet();
+
+        assertTrue(set instanceof HashSet);
+    }
+
+    @Test
+    public void copy_set()
+    {
+        List<String> start = asList("fred", "barney");
+
+        Set<String> set = newSet(start);
+
+        assertEquals(set.size(), 2);
+        assertTrue(set.contains("fred"));
+        assertTrue(set.contains("barney"));
+    }
+
+    @Test
+    public void set_from_varargs()
+    {
+        Set<String> set = newSet("fred", "barney");
+
+        assertEquals(set.size(), 2);
+        assertTrue(set.contains("fred"));
+        assertTrue(set.contains("barney"));
+    }
+
+    @Test
+    public void new_list()
+    {
+        List<String> list = newList();
+
+        assertTrue(list instanceof ArrayList);
+    }
+
+    @Test
+    public void new_list_copy()
+    {
+        List<String> start = Arrays.asList("Fred", "Barney", "Wilma");
+        List<String> copy = newList(start);
+
+        assertNotSame(copy, start);
+        assertEquals(copy, start);
+    }
+
+    private static final int THREAD_COUNT = 20;
+
+    @Test
+    public void new_threadsafe_list() throws Exception
+    {
+        final List<String> threadNames = CollectionFactory.newThreadSafeList();
+
+        List<Thread> threads = CollectionFactory.newList();
+
+        Runnable r = new Runnable()
+        {
+            public void run()
+            {
+                String name = Thread.currentThread().getName();
+                threadNames.add(name);
+            }
+        };
+
+        for (int i = 0; i < THREAD_COUNT; i++)
+        {
+            Thread t = new Thread(r);
+            threads.add(t);
+        }
+
+        // Start all the threads at the same time.
+
+        for (Thread t : threads)
+        {
+            t.start();
+        }
+
+        // Wait for all threads to complete
+
+        for (Thread t : threads)
+        {
+            t.join();
+        }
+
+        // Make sure they all executed. If the list was not thread safe, highly unlikely this
+        // would work.
+
+        assertEquals(threadNames.size(), THREAD_COUNT);
+    }
+}

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/DefenseTest.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/DefenseTest.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/DefenseTest.java&r2=477910
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/DefenseTest.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/DefenseTest.java Tue Nov 21 13:48:47 2006
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.util;
+package org.apache.tapestry.ioc.internal.util;
 
 import static org.apache.tapestry.ioc.internal.util.Defense.cast;
 import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
@@ -22,9 +22,6 @@
 import org.apache.tapestry.ioc.test.TestBase;
 import org.testng.annotations.Test;
 
-/**
- * 
- */
 public class DefenseTest extends TestBase
 {
 

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/IdAllocatorTest.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IdAllocatorTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/IdAllocatorTest.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IdAllocatorTest.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/IdAllocatorTest.java&r2=477910
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/IdAllocatorTest.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/IdAllocatorTest.java Tue Nov 21 13:48:47 2006
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.util;
+package org.apache.tapestry.ioc.internal.util;
 
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
 

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java&r2=477910
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java Tue Nov 21 13:48:47 2006
@@ -12,57 +12,56 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.ioc.internal.util;
-
-import java.util.Locale;
-
-import org.apache.tapestry.ioc.internal.util.LocalizedNameGenerator;
-import org.apache.tapestry.test.TapestryTestCase;
-import org.testng.annotations.Test;
-
-public class LocalizedNameGeneratorTest extends TapestryTestCase
-{
-
-    private void run(String path, Locale locale, String... expected)
-    {
-        LocalizedNameGenerator g = new LocalizedNameGenerator(path, locale);
-
-        for (String s : expected)
-        {
-            assertTrue(g.hasNext());
-            assertEquals(g.next(), s);
-        }
-
-        assertFalse(g.hasNext());
-    }
-
-    @Test
-    public void locale_with_language_and_country()
-    {
-        run("basic.test", Locale.US, "basic_en_US.test", "basic_en.test", "basic.test");
-    }
-
-    @Test
-    public void locale_with_just_language()
-    {
-        run("noCountry.zap", Locale.FRENCH, "noCountry_fr.zap", "noCountry.zap");
-    }
-
-    @Test
-    public void locale_with_variant_but_no_country()
-    {
-
-        // The double-underscore is correct, it's a kind
-        // of placeholder for the null country.
-        // JDK1.3 always converts the locale to upper case. JDK 1.4
-        // does not. To keep this test happyt, we selected an all-uppercase
-        // locale.
-
-        run(
-                "fred.foo",
-                new Locale("en", "", "GEEK"),
-                "fred_en__GEEK.foo",
-                "fred_en.foo",
-                "fred.foo");
-    }
-}
+package org.apache.tapestry.ioc.internal.util;
+
+import java.util.Locale;
+
+import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.testng.annotations.Test;
+
+public class LocalizedNameGeneratorTest extends IOCTestCase
+{
+
+    private void run(String path, Locale locale, String... expected)
+    {
+        LocalizedNameGenerator g = new LocalizedNameGenerator(path, locale);
+
+        for (String s : expected)
+        {
+            assertTrue(g.hasNext());
+            assertEquals(g.next(), s);
+        }
+
+        assertFalse(g.hasNext());
+    }
+
+    @Test
+    public void locale_with_language_and_country()
+    {
+        run("basic.test", Locale.US, "basic_en_US.test", "basic_en.test", "basic.test");
+    }
+
+    @Test
+    public void locale_with_just_language()
+    {
+        run("noCountry.zap", Locale.FRENCH, "noCountry_fr.zap", "noCountry.zap");
+    }
+
+    @Test
+    public void locale_with_variant_but_no_country()
+    {
+
+        // The double-underscore is correct, it's a kind
+        // of placeholder for the null country.
+        // JDK1.3 always converts the locale to upper case. JDK 1.4
+        // does not. To keep this test happyt, we selected an all-uppercase
+        // locale.
+
+        run(
+                "fred.foo",
+                new Locale("en", "", "GEEK"),
+                "fred_en__GEEK.foo",
+                "fred_en.foo",
+                "fred.foo");
+    }
+}

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocationImplTest.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/LocationImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocationImplTest.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/LocationImplTest.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocationImplTest.java&r2=477910
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/LocationImplTest.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocationImplTest.java Tue Nov 21 13:48:47 2006
@@ -12,88 +12,84 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal;
-
-import java.net.URL;
-import java.util.Locale;
-import java.util.Random;
-
+package org.apache.tapestry.ioc.internal.util;
+
+import java.net.URL;
+import java.util.Locale;
+import java.util.Random;
+
 import org.apache.tapestry.ioc.Location;
 import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.LocationImpl;
-import org.apache.tapestry.test.TapestryTestCase;
-import org.testng.annotations.Test;
-
-/**
- * 
- */
-public class LocationImplTest extends TapestryTestCase
-{
-    private final Random _random = new Random();
-
-    private static class ResourceFixture implements Resource
-    {
-        public URL getResourceURL()
-        {
-            return null;
-        }
-
-        public Resource getLocalization(Locale locale)
-        {
-            return null;
-        }
-
-        @Override
-        public String toString()
-        {
-            return "<Resource>";
-        }
-    }
-
-    @Test
-    public void all_three_parameters()
-    {
-        Resource r = new ResourceFixture();
-
-        int line = _random.nextInt();
-        int column = _random.nextInt();
-
-        Location l = new LocationImpl(r, line, column);
-
-        assertSame(l.getResource(), r);
-        assertEquals(l.getLine(), line);
-        assertEquals(l.getColumn(), column);
-
-        assertEquals(l.toString(), String.format("<Resource>, line %d, column %d", line, column));
-    }
-
-    @Test
-    public void unknown_column()
-    {
-        Resource r = new ResourceFixture();
-
-        int line = _random.nextInt();
-
-        Location l = new LocationImpl(r, line);
-
-        assertSame(l.getResource(), r);
-        assertEquals(l.getLine(), line);
-        assertEquals(l.getColumn(), -1);
-
-        assertEquals(l.toString(), String.format("<Resource>, line %d", line));
-    }
-
-    @Test
-    public void unknown_line_and_column()
-    {
-        Resource r = new ResourceFixture();
-
-        Location l = new LocationImpl(r);
-
-        assertSame(l.getResource(), r);
-        assertEquals(l.getLine(), -1);
-        assertEquals(l.getColumn(), -1);
-
-        assertEquals(l.toString(), "<Resource>");
-    }
-}
+import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.testng.annotations.Test;
+
+public class LocationImplTest extends IOCTestCase
+{
+    private final Random _random = new Random();
+
+    private static class ResourceFixture implements Resource
+    {
+        public URL getResourceURL()
+        {
+            return null;
+        }
+
+        public Resource getLocalization(Locale locale)
+        {
+            return null;
+        }
+
+        @Override
+        public String toString()
+        {
+            return "<Resource>";
+        }
+    }
+
+    @Test
+    public void all_three_parameters()
+    {
+        Resource r = new ResourceFixture();
+
+        int line = _random.nextInt();
+        int column = _random.nextInt();
+
+        Location l = new LocationImpl(r, line, column);
+
+        assertSame(l.getResource(), r);
+        assertEquals(l.getLine(), line);
+        assertEquals(l.getColumn(), column);
+
+        assertEquals(l.toString(), String.format("<Resource>, line %d, column %d", line, column));
+    }
+
+    @Test
+    public void unknown_column()
+    {
+        Resource r = new ResourceFixture();
+
+        int line = _random.nextInt();
+
+        Location l = new LocationImpl(r, line);
+
+        assertSame(l.getResource(), r);
+        assertEquals(l.getLine(), line);
+        assertEquals(l.getColumn(), -1);
+
+        assertEquals(l.toString(), String.format("<Resource>, line %d", line));
+    }
+
+    @Test
+    public void unknown_line_and_column()
+    {
+        Resource r = new ResourceFixture();
+
+        Location l = new LocationImpl(r);
+
+        assertSame(l.getResource(), r);
+        assertEquals(l.getLine(), -1);
+        assertEquals(l.getColumn(), -1);
+
+        assertEquals(l.toString(), "<Resource>");
+    }
+}

Copied: tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/MessageFormatterImplTest.java (from r477721, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/MessageFormatterImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/MessageFormatterImplTest.java?view=diff&rev=477910&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/MessageFormatterImplTest.java&r1=477721&p2=tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/MessageFormatterImplTest.java&r2=477910
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/MessageFormatterImplTest.java (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/MessageFormatterImplTest.java Tue Nov 21 13:48:47 2006
@@ -12,49 +12,45 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.apache.tapestry.internal;
-
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.internal.util.MessageFormatterImpl;
-import org.testng.annotations.Test;
-
-/**
- * 
- */
-public class MessageFormatterImplTest extends InternalBaseTestCase
-{
-    private String run(String format, Object... args)
-    {
-        return new MessageFormatterImpl(format).format(args);
-    }
-
-    @Test
-    public void standard_args()
-    {
-        assertEquals(run("Tapestry is %s.", "cool"), "Tapestry is cool.");
-        assertEquals(run("Tapestry release #%d.", 5), "Tapestry release #5.");
-        assertEquals(
-                run("%s is %s at version %d.", "Tapestry", "cool", 5),
-                "Tapestry is cool at version 5.");
-    }
-
-    @Test
-    public void throwable_argument()
-    {
-        Throwable t = new RuntimeException("Just didn't feel right.");
-
-        assertEquals(
-                run("%s failed: %s", "Something", t),
-                "Something failed: Just didn't feel right.");
-    }
-
-    @Test
-    public void throwable_argument_with_null_message()
-    {
-        Throwable t = new NullPointerException();
-
-        assertEquals(
-                run("%s failed: %s", "Something", t),
-                "Something failed: java.lang.NullPointerException");
-    }
-}
+package org.apache.tapestry.ioc.internal.util;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class MessageFormatterImplTest extends Assert
+{
+    private String run(String format, Object... args)
+    {
+        return new MessageFormatterImpl(format).format(args);
+    }
+
+    @Test
+    public void standard_args()
+    {
+        assertEquals(run("Tapestry is %s.", "cool"), "Tapestry is cool.");
+        assertEquals(run("Tapestry release #%d.", 5), "Tapestry release #5.");
+        assertEquals(
+                run("%s is %s at version %d.", "Tapestry", "cool", 5),
+                "Tapestry is cool at version 5.");
+    }
+
+    @Test
+    public void throwable_argument()
+    {
+        Throwable t = new RuntimeException("Just didn't feel right.");
+
+        assertEquals(
+                run("%s failed: %s", "Something", t),
+                "Something failed: Just didn't feel right.");
+    }
+
+    @Test
+    public void throwable_argument_with_null_message()
+    {
+        Throwable t = new NullPointerException();
+
+        assertEquals(
+                run("%s failed: %s", "Something", t),
+                "Something failed: java.lang.NullPointerException");
+    }
+}