From 87a382ac8ff1a3f2927a37539a285a2efc7472a8 Mon Sep 17 00:00:00 2001 From: Imran M Yousuf Date: Tue, 24 Mar 2009 09:01:46 +0600 Subject: [PATCH] Add test case for ContentDisposition and FormDataContentDisposition ContentDispositionTest takes into account the bug related to string production by toString related to unquoted date strings. FormDataContentDispositionTest takes into account the bug related to the disparity in creating dispositions and ensures that all constructors are coherent. Signed-off-by: Imran M Yousuf --- .../impl/http/header/ContentDispositionTest.java | 146 ++++++++++++++++++++ .../header/FormDataContentDispositionTest.java | 146 ++++++++++++++++++++ 2 files changed, 292 insertions(+), 0 deletions(-) create mode 100644 jersey-tests/src/test/java/com/sun/jersey/impl/http/header/ContentDispositionTest.java create mode 100644 jersey-tests/src/test/java/com/sun/jersey/impl/http/header/FormDataContentDispositionTest.java diff --git a/jersey-tests/src/test/java/com/sun/jersey/impl/http/header/ContentDispositionTest.java b/jersey-tests/src/test/java/com/sun/jersey/impl/http/header/ContentDispositionTest.java new file mode 100644 index 0000000..ae7c813 --- /dev/null +++ b/jersey-tests/src/test/java/com/sun/jersey/impl/http/header/ContentDispositionTest.java @@ -0,0 +1,146 @@ +/* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can obtain + * a copy of the License at https://jersey.dev.java.net/CDDL+GPL.html + * or jersey/legal/LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at jersey/legal/LICENSE.txt. + * Sun designates this particular file as subject to the "Classpath" exception + * as provided by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the License + * Header, with the fields enclosed by brackets [] replaced by your own + * identifying information: "Portions Copyrighted [year] + * [name of copyright owner]" + * + * Contributor(s): + * + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + */ +package com.sun.jersey.impl.http.header; + +import com.sun.jersey.core.header.ContentDisposition; +import com.sun.jersey.core.header.HttpDateFormat; +import com.sun.jersey.core.header.reader.HttpHeaderReader; +import java.text.ParseException; +import java.util.Date; +import junit.framework.TestCase; + +/** + * + * @author Imran@SmartITEngineering.Com + */ +public class ContentDispositionTest + extends TestCase { + + protected String contentDispositionType; + + public ContentDispositionTest(String testName) { + super(testName); + contentDispositionType = "inline"; + } + + /** + * Test of toString method, of class com.sun.jersey.api.response.CacheControl. + */ + public void testCreate() { + System.out.println("create"); + ContentDisposition contentDisposition = ContentDisposition.type(null). + build(); + assertNotNull(contentDisposition); + assertEquals(null, contentDisposition.getType()); + contentDisposition = ContentDisposition.type(contentDispositionType). + build(); + assertNotNull(contentDisposition); + assertEquals(contentDispositionType, contentDisposition.getType()); + Date date = new Date(); + contentDisposition = ContentDisposition.type(contentDispositionType). + fileName( + "test.file").creationDate(date).modificationDate(date).readDate(date). + size(1222).build(); + assertContentDisposition(contentDisposition, date); + String header = new StringBuilder(contentDispositionType).toString(); + try { + contentDisposition = new ContentDisposition(contentDisposition. + toString()); + contentDisposition = new ContentDisposition(header); + assertNotNull(contentDisposition); + assertEquals(contentDispositionType, contentDisposition.getType()); + String dateString = HttpDateFormat.getPreferedDateFormat().format( + date); + header = new StringBuilder(contentDispositionType).append( + ";filename=\"test.file\";creation-date=\"").append( + dateString).append("\";modification-date=\"").append(dateString). + append("\";read-date=\"").append(dateString).append( + "\";size=1222").toString(); + contentDisposition = new ContentDisposition(header); + assertContentDisposition(contentDisposition, date); + contentDisposition = new ContentDisposition(HttpHeaderReader. + newInstance(header)); + assertContentDisposition(contentDisposition, date); + } + catch (ParseException ex) { + fail(ex.getMessage()); + } + try { + contentDisposition = new ContentDisposition((HttpHeaderReader) null); + } + catch (ParseException exception) { + fail(exception.getMessage()); + } + catch (NullPointerException exception) { + //expected + } + } + + /** + * Test of toString method, of class com.sun.jersey.api.response.CacheControl. + */ + public void testToString() { + Date date = new Date(); + ContentDisposition contentDisposition = ContentDisposition.type( + contentDispositionType). + fileName("test.file").creationDate(date).modificationDate(date). + readDate(date).size(1222).build(); + String dateString = HttpDateFormat.getPreferedDateFormat().format( + date); + String header = new StringBuilder(contentDispositionType).append( + ";filename=\"test.file\";creation-date=\"").append( + dateString).append("\";modification-date=\"").append(dateString). + append("\";read-date=\"").append(dateString).append( + "\";size=1222").toString(); + assertEquals(header, contentDisposition.toString()); + } + + protected void assertContentDisposition( + ContentDisposition contentDisposition, + Date date) { + assertNotNull(contentDisposition); + assertEquals(contentDispositionType, contentDisposition.getType()); + assertEquals("test.file", contentDisposition.getFileName()); + assertEquals(date.toString(), contentDisposition.getModificationDate(). + toString()); + assertEquals(date.toString(), + contentDisposition.getReadDate().toString()); + assertEquals(date.toString(), contentDisposition.getCreationDate(). + toString()); + assertEquals(1222, contentDisposition.getSize()); + } +} diff --git a/jersey-tests/src/test/java/com/sun/jersey/impl/http/header/FormDataContentDispositionTest.java b/jersey-tests/src/test/java/com/sun/jersey/impl/http/header/FormDataContentDispositionTest.java new file mode 100644 index 0000000..053ef4e --- /dev/null +++ b/jersey-tests/src/test/java/com/sun/jersey/impl/http/header/FormDataContentDispositionTest.java @@ -0,0 +1,146 @@ +/* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can obtain + * a copy of the License at https://jersey.dev.java.net/CDDL+GPL.html + * or jersey/legal/LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at jersey/legal/LICENSE.txt. + * Sun designates this particular file as subject to the "Classpath" exception + * as provided by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the License + * Header, with the fields enclosed by brackets [] replaced by your own + * identifying information: "Portions Copyrighted [year] + * [name of copyright owner]" + * + * Contributor(s): + * + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + */ +package com.sun.jersey.impl.http.header; + +import com.sun.jersey.core.header.FormDataContentDisposition; +import com.sun.jersey.core.header.HttpDateFormat; +import com.sun.jersey.core.header.reader.HttpHeaderReader; +import java.text.ParseException; +import java.util.Date; + +/** + * + * @author Imran@SmartITEngineering.Com + */ +public class FormDataContentDispositionTest + extends ContentDispositionTest { + + public FormDataContentDispositionTest(String testName) { + super(testName); + contentDispositionType = "form-data"; + } + + /** + * Test of toString method, of class com.sun.jersey.api.response.CacheControl. + */ + @Override + public void testCreate() { + System.out.println("create"); + Date date = new Date(); + FormDataContentDisposition contentDisposition; + contentDisposition = FormDataContentDisposition.name("testData"). + fileName("test.file").creationDate(date).modificationDate(date). + readDate(date).size(1222).build(); + assertFormDataContentDisposition(contentDisposition, date); + try { + String dateString = HttpDateFormat.getPreferedDateFormat().format( + date); + String header = new StringBuilder(contentDispositionType).append( + ";filename=\"test.file\";creation-date=\"").append( + dateString).append("\";modification-date=\"").append(dateString). + append("\";read-date=\"").append(dateString).append( + "\";size=1222").append(";name=\"testData\"").toString(); + contentDisposition = new FormDataContentDisposition( + contentDisposition.toString()); + assertFormDataContentDisposition(contentDisposition, date); + contentDisposition = new FormDataContentDisposition(header); + assertFormDataContentDisposition(contentDisposition, date); + contentDisposition = new FormDataContentDisposition( + HttpHeaderReader.newInstance(header)); + assertFormDataContentDisposition(contentDisposition, date); + } + catch (ParseException ex) { + fail(ex.getMessage()); + } + try { + contentDisposition = new FormDataContentDisposition( + (HttpHeaderReader) null); + } + catch (ParseException exception) { + fail(exception.getMessage()); + } + catch (NullPointerException exception) { + //expected + } + try { + contentDisposition = new FormDataContentDisposition( + "form-data;filename=\"test.file\""); + } + catch (ParseException exception) { + fail(exception.getMessage()); + } + catch (IllegalArgumentException exception) { + //expected + } + try { + contentDisposition = FormDataContentDisposition.name(null).build(); + } + catch (IllegalArgumentException exception) { + //expected + } + catch (Exception exception) { + fail(exception.getMessage()); + } + } + + /** + * Test of toString method, of class com.sun.jersey.api.response.CacheControl. + */ + @Override + public void testToString() { + Date date = new Date(); + FormDataContentDisposition contentDisposition; + contentDisposition = FormDataContentDisposition.name("testData"). + fileName("test.file").creationDate(date).modificationDate(date). + readDate(date).size(1222).build(); + String dateString = HttpDateFormat.getPreferedDateFormat().format( + date); + String header = new StringBuilder(contentDispositionType).append( + ";filename=\"test.file\";creation-date=\"").append( + dateString).append("\";modification-date=\"").append(dateString). + append("\";read-date=\"").append(dateString).append( + "\";size=1222").append(";name=\"testData\"").toString(); + assertEquals(header, contentDisposition.toString()); + } + + protected void assertFormDataContentDisposition( + FormDataContentDisposition contentDisposition, + Date date) { + super.assertContentDisposition(contentDisposition, date); + assertEquals("testData", contentDisposition.getName()); + } +} -- 1.5.6