Add test cases for apache#276

Author: sigee

src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java

@@ -60,7 +60,7 @@ protected BeanUtilsBean initialValue() {
     /**
      * Logging for this instance
      */
-    private static final Log LOG = LogFactory.getLog(BeanUtilsBean.class);
+    private static Log LOG = LogFactory.getLog(BeanUtilsBean.class);
 
     /** A reference to Throwable's initCause method, or null if it's not there in this JVM */
     private static final Method INIT_CAUSE_METHOD = getInitCauseMethod();
@@ -172,6 +172,12 @@ public BeanUtilsBean(final ConvertUtilsBean convertUtilsBean,
         this.propertyUtilsBean = propertyUtilsBean;
     }
 
+    public BeanUtilsBean(final ConvertUtilsBean convertUtilsBean, final PropertyUtilsBean propertyUtilsBean, final Log log) {
+        this.convertUtilsBean = convertUtilsBean;
+        this.propertyUtilsBean = propertyUtilsBean;
+        LOG = log;
+    }
+
     /**
      * <p>Clone a bean based on the available property getters and setters,
      * even if the bean class itself does not implement Cloneable.</p>

src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java

@@ -20,6 +20,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Locale;
@@ -31,6 +32,8 @@
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * <p>
@@ -1431,10 +1434,152 @@ public void testSetPropertyWriteOnly() throws Exception {
 
     }
 
+    public void testCopyPropertyLogTrace() throws Exception {
+        LogSpy logSpy = new LogSpy(LogFactory.getLog(BeanUtilsBean.class));
+        final BeanUtilsBean beanUtils = new BeanUtilsBean(new ConvertUtilsBean(), new PropertyUtilsBean(), logSpy);
+
+        beanUtils.copyProperty(bean, "writeOnlyProperty", "New value");
+
+        assertEquals("  copyProperty(" + bean.toString() + ", writeOnlyProperty, New value)", logSpy.getTraceMessages().get(0));
+    }
+
+    public void testCopyPropertyLogTraceWithNull() throws Exception {
+        LogSpy logSpy = new LogSpy(LogFactory.getLog(BeanUtilsBean.class));
+        final BeanUtilsBean beanUtils = new BeanUtilsBean(new ConvertUtilsBean(), new PropertyUtilsBean(), logSpy);
+
+        beanUtils.copyProperty(bean, "writeOnlyProperty", null);
+
+        assertEquals("  copyProperty(" + bean.toString() + ", writeOnlyProperty, <NULL>)", logSpy.getTraceMessages().get(0));
+    }
+
+    public void testCopyPropertyLogTraceWhenBeanOverRidesToString() throws Exception {
+        final TestBean2 bean = new TestBean2();
+
+        LogSpy logSpy = new LogSpy(LogFactory.getLog(BeanUtilsBean.class));
+        final BeanUtilsBean beanUtils = new BeanUtilsBean(new ConvertUtilsBean(), new PropertyUtilsBean(), logSpy);
+
+        beanUtils.copyProperty(bean, "writeOnlyProperty", "New value");
+
+        assertEquals("  copyProperty(" + bean.toString() + ", writeOnlyProperty, has been set)", logSpy.getTraceMessages().get(0));
+    }
+
     /**
      * Throw an exception with the specified message.
      */
     private void throwException(final String msg) throws Throwable {
         throw new Exception(msg);
     }
+
+    public class LogSpy implements Log {
+        private final Log originalLog;
+        private final ArrayList<Object> traceMessages = new ArrayList<>();
+
+        public ArrayList<Object> getTraceMessages() {
+            return traceMessages;
+        }
+
+        public LogSpy(Log originalLog) {
+            this.originalLog = originalLog;
+        }
+
+        @Override
+        public void debug(Object message) {
+            originalLog.debug(message);
+        }
+
+        // Implement or delegate other methods in the Log interface
+        @Override
+        public void debug(Object message, Throwable t) {
+            originalLog.debug(message, t);
+        }
+
+        @Override
+        public void error(Object message) {
+            originalLog.error(message);
+        }
+
+        @Override
+        public void error(Object message, Throwable t) {
+            originalLog.error(message, t);
+        }
+
+        @Override
+        public void fatal(Object message) {
+            originalLog.fatal(message);
+        }
+
+        @Override
+        public void fatal(Object message, Throwable t) {
+            originalLog.fatal(message, t);
+        }
+
+        @Override
+        public void info(Object message) {
+            originalLog.info(message);
+        }
+
+        @Override
+        public void info(Object message, Throwable t) {
+            originalLog.info(message, t);
+        }
+
+        @Override
+        public boolean isDebugEnabled() {
+            return originalLog.isDebugEnabled();
+        }
+
+        @Override
+        public boolean isErrorEnabled() {
+            return originalLog.isErrorEnabled();
+        }
+
+        @Override
+        public boolean isFatalEnabled() {
+            return originalLog.isFatalEnabled();
+        }
+
+        @Override
+        public boolean isInfoEnabled() {
+            return originalLog.isInfoEnabled();
+        }
+
+        @Override
+        public boolean isTraceEnabled() {
+            return true;
+//            return originalLog.isTraceEnabled();
+        }
+
+        @Override
+        public boolean isWarnEnabled() {
+            return originalLog.isWarnEnabled();
+        }
+
+        @Override
+        public void trace(Object message) {
+            traceMessages.add(message);
+            originalLog.trace(message);
+        }
+
+        @Override
+        public void trace(Object message, Throwable t) {
+            originalLog.trace(message, t);
+        }
+
+        @Override
+        public void warn(Object message) {
+            originalLog.warn(message);
+        }
+
+        @Override
+        public void warn(Object message, Throwable t) {
+            originalLog.warn(message, t);
+        }
+    }
+
+    class TestBean2 extends TestBean {
+        @Override
+        public String toString() {
+            return super.toString();
+        }
+    }
 }