Fixed regresson in a deprecated method of FileBody

Contributed by Andrey Pohilko <apc4 at ya.ru>

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1682039 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2015-05-27 14:22:01 +00:00
parent 41d040e006
commit 7d8ac569be
2 changed files with 47 additions and 1 deletions

View File

@ -60,7 +60,7 @@ public class FileBody extends AbstractContentBody {
super(contentType);
Args.notNull(file, "File");
this.file = file;
this.filename = filename;
this.filename = filename == null ? file.getName() : filename;
}
/**

View File

@ -0,0 +1,46 @@
/*
* ====================================================================
* 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.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.http.entity.mime;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.mime.content.FileBody;
import org.junit.Assert;
import org.junit.Test;
import java.io.File;
public class FormBodyPartTest {
@Test
public void testConstructorCompat() throws Exception {
final File tmp= File.createTempFile("test", "test");
tmp.deleteOnExit();
final FileBody obj = new FileBody(tmp, ContentType.APPLICATION_OCTET_STREAM);
Assert.assertEquals(tmp.getName(), obj.getFilename());
}
}