svn commit: r587468 - in /commons/proper/proxy/trunk/src: main/java/org/apache/commons/proxy/provider/ test/java/org/apache/commons/proxy/factory/ test/java/org/apache/commons/proxy/provider/

[jc...@apache.org]

Author: jcarman
Date: Tue Oct 23 05:05:16 2007
New Revision: 587468

URL: http://svn.apache.org/viewvc?rev=587468&view=rev
Log:
Removing ProviderUtils class.  Seems unnecessary.

Removed:
    commons/proper/proxy/trunk/src/main/java/org/apache/commons/proxy/provider/ProviderUtils.java
Modified:
    commons/proper/proxy/trunk/src/test/java/org/apache/commons/proxy/factory/AbstractProxyFactoryTestCase.java
    commons/proper/proxy/trunk/src/test/java/org/apache/commons/proxy/provider/TestCloningProvider.java

Modified: commons/proper/proxy/trunk/src/test/java/org/apache/commons/proxy/factory/AbstractProxyFactoryTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/src/test/java/org/apache/commons/proxy/factory/AbstractProxyFactoryTestCase.java?rev=587468&r1=587467&r2=587468&view=diff
==============================================================================
--- commons/proper/proxy/trunk/src/test/java/org/apache/commons/proxy/factory/AbstractProxyFactoryTestCase.java (original)
+++ commons/proper/proxy/trunk/src/test/java/org/apache/commons/proxy/factory/AbstractProxyFactoryTestCase.java Tue Oct 23 05:05:16 2007
@@ -17,25 +17,15 @@
 
 package org.apache.commons.proxy.factory;
 
-import org.apache.commons.proxy.Invocation;
-import org.apache.commons.proxy.Interceptor;
-import org.apache.commons.proxy.Invoker;
-import org.apache.commons.proxy.ObjectProvider;
-import org.apache.commons.proxy.ProxyFactory;
-import org.apache.commons.proxy.provider.ProviderUtils;
-import org.apache.commons.proxy.util.AbstractTestCase;
-import org.apache.commons.proxy.util.DuplicateEcho;
-import org.apache.commons.proxy.util.Echo;
-import org.apache.commons.proxy.util.EchoImpl;
-import org.apache.commons.proxy.util.SuffixInterceptor;
+import org.apache.commons.proxy.*;
+import org.apache.commons.proxy.provider.BeanProvider;
+import org.apache.commons.proxy.provider.ConstantProvider;
+import org.apache.commons.proxy.provider.SingletonProvider;
+import org.apache.commons.proxy.util.*;
 
 import java.io.IOException;
 import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
+import java.util.*;
 
 /**
  * @author James Carman
@@ -59,7 +49,7 @@
 
     public void testInterfaceHierarchies()
     {
-        final SortedSet set = ( SortedSet ) factory.createDelegatorProxy( ProviderUtils.constantProvider( new TreeSet() ), new Class[] { SortedSet.class } );
+        final SortedSet set = ( SortedSet ) factory.createDelegatorProxy( new ConstantProvider( new TreeSet() ), new Class[] { SortedSet.class } );
         set.add( "Hello" );
     }
 
@@ -115,7 +105,7 @@
 
     private ObjectProvider createSingletonEcho()
     {
-        return ProviderUtils.singletonProvider( ProviderUtils.beanProvider( EchoImpl.class ) );
+        return new SingletonProvider( new BeanProvider( EchoImpl.class ) );
     }
 
     public void testMethodInvocationImplementation() throws Exception
@@ -165,8 +155,8 @@
 
     public void testDelegatingProxyClassCaching() throws Exception
     {
-        final Echo proxy1 = ( Echo ) factory.createDelegatorProxy( ProviderUtils.constantProvider( new EchoImpl() ), ECHO_ONLY );
-        final Echo proxy2 = ( Echo ) factory.createDelegatorProxy( ProviderUtils.constantProvider( new EchoImpl() ), ECHO_ONLY );
+        final Echo proxy1 = ( Echo ) factory.createDelegatorProxy( new ConstantProvider( new EchoImpl() ), ECHO_ONLY );
+        final Echo proxy2 = ( Echo ) factory.createDelegatorProxy( new ConstantProvider( new EchoImpl() ), ECHO_ONLY );
         assertEquals( proxy1.getClass(), proxy2.getClass() );
     }
 
@@ -179,7 +169,7 @@
 
     public void testProxyWithCheckedException() throws Exception
     {
-        final Echo proxy = ( Echo ) factory.createDelegatorProxy( ProviderUtils.constantProvider( new EchoImpl() ), ECHO_ONLY );
+        final Echo proxy = ( Echo ) factory.createDelegatorProxy( new ConstantProvider( new EchoImpl() ), ECHO_ONLY );
         try
         {
             proxy.ioException();
@@ -192,7 +182,7 @@
 
     public void testProxyWithUncheckedException() throws Exception
     {
-        final Echo proxy = ( Echo ) factory.createDelegatorProxy( ProviderUtils.constantProvider( new EchoImpl() ), ECHO_ONLY );
+        final Echo proxy = ( Echo ) factory.createDelegatorProxy( new ConstantProvider( new EchoImpl() ), ECHO_ONLY );
         try
         {
             proxy.illegalArgument();

Modified: commons/proper/proxy/trunk/src/test/java/org/apache/commons/proxy/provider/TestCloningProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/src/test/java/org/apache/commons/proxy/provider/TestCloningProvider.java?rev=587468&r1=587467&r2=587468&view=diff
==============================================================================
--- commons/proper/proxy/trunk/src/test/java/org/apache/commons/proxy/provider/TestCloningProvider.java (original)
+++ commons/proper/proxy/trunk/src/test/java/org/apache/commons/proxy/provider/TestCloningProvider.java Tue Oct 23 05:05:16 2007
@@ -37,6 +37,19 @@
         assertNotSame( clone2, clone1 );
     }
 
+    public void testWithPrivateCloneMethod()
+    {
+        final CloningProvider provider = new CloningProvider( new PrivateCloneable() );
+        try
+        {
+            provider.getObject();
+            fail();
+        }
+        catch( ObjectProviderException e )
+        {
+        }
+    }
+    
     public void testWithInvalidCloneable()
     {
         final CloningProvider provider = new CloningProvider( new InvalidCloneable() );
@@ -67,6 +80,14 @@
     {
     }
 
+    public static class PrivateCloneable implements Cloneable
+    {
+        protected Object clone()
+        {
+            return this;
+        }
+    }
+    
     public static class ExceptionCloneable implements Cloneable
     {
         public Object clone()