/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.apache.commons.beanutils.bugs;

import java.util.Comparator;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;

import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

/**
 * See https://issues.apache.org/jira/browse/BEANUTILS-339
 * <p />
 *
 * @version $Revision$ $Date$
 */
public class Jira339TestCase extends TestCase {

    private Log log = LogFactory.getLog(Jira339TestCase.class);

    /**
     * Create a test case with the specified name.
     *
     * @param name The name of the test
     */
    public Jira339TestCase(String name) {
        super(name);
    }

    /**
     * Run the Test.
     *
     * @param args Arguments
     */
    public static void main(String[] args) {
        junit.textui.TestRunner.run(suite());
    }

    /**
     * Create a test suite for this test.
     *
     * @return a test suite
     */
    public static Test suite() {
        return (new TestSuite(Jira339TestCase.class));
    }

    /**
     * Set up.
     *
     * @throws java.lang.Exception
     */
    protected void setUp() throws Exception {
        super.setUp();
    }

    /**
     * Tear Down.
     *
     * @throws java.lang.Exception
     */
    protected void tearDown() throws Exception {
        super.tearDown();
    }

    /**
     * Test {@link PropertyUtils#getProperty(Object, String)}
     */
    public void testIssue_BEANUTILS_339_BeanUtilsBean_setProperty() {
        
        TestBean bean = new TestBean();
        try {
            BeanUtils.setProperty(bean, "comparator", null);
        } catch (Throwable t) {
            log.error("Failed: " + t.getMessage(), t);
            fail("Threw exception: " + t);
        }
        assertNull("TestBean comparator should be null", bean.getComparator());
    }

    /**
     * Test Bean.
     */
    public static class TestBean {
        private Comparator comparator;

        /**
         * Return the comparator.
         *
         * @return the comparator
         */
        public Comparator getComparator() {
            return comparator;
        }

        /**
         * Set the comparator.
         *
         * @param comparator the comparator
         */
        public void setComparator(Comparator comparator) {
            this.comparator = comparator;
        }
        
    }
}

@@ -868,16 +868,64 @@
 parator;
+%0Aimport java.util.HashMap;%0Aimport java.util.Map;
 %0A%0Aimport
@@ -2313,17 +2313,17 @@
 tyUtils#
-g
+s
 etProper
@@ -2339,16 +2339,24 @@
 , String
+, Object
 )%7D%0A     
@@ -2491,16 +2491,16 @@
   try %7B%0A
-
         
@@ -2771,32 +2771,599 @@
 ator());%0A    %7D%0A%0A
+    /**%0A     * Test %7B@link BeanUtils#populate(Object, Map)%7D%0A     */%0A    public void testIssue_BEANUTILS_331_BeanUtilsBean_populate() %7B%0A        %0A        TestBean bean = new TestBean();%0A        try %7B%0A            Map properties = new HashMap();%0A            properties.put(%22comparator%22, null);%0A            BeanUtils.populate(bean, properties);%0A        %7D catch (Throwable t) %7B%0A            log.error(%22Failed: %22 + t.getMessage(), t);%0A            fail(%22Threw exception: %22 + t);%0A        %7D%0A        assertNull(%22TestBean comparator should be null%22, bean.getComparator());%0A    %7D%0A%0A
     /**%0A     * T

Add test for BEANUTILS-331 (duplicates BEANUTILS-339