Author: scottbw
Date: Fri Apr 9 12:29:03 2010
New Revision: 932381
URL: http://svn.apache.org/viewvc?rev=932381&view=rev
Log:
Some minor validation fixes (return false where a null File is checked, removed
a validation clause that's impossible to reach), and increased test coverage to
100%
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/ContentTypeUtilsTest.java
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/ContentTypeUtils.java
Modified:
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/ContentTypeUtilsTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/ContentTypeUtilsTest.java?rev=932381&r1=932380&r2=932381&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/ContentTypeUtilsTest.java
(original)
+++
incubator/wookie/trunk/parser/java/src-test/org/apache/wookie/w3c/test/ContentTypeUtilsTest.java
Fri Apr 9 12:29:03 2010
@@ -16,18 +16,52 @@ package org.apache.wookie.w3c.test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import java.io.File;
+
import org.apache.wookie.w3c.util.ContentTypeUtils;
import org.junit.Test;
public class ContentTypeUtilsTest {
@Test
+ public void classTest(){
+ @SuppressWarnings("unused")
+ ContentTypeUtils test = new ContentTypeUtils();
+ }
+
+ @Test
+ public void Nulls(){
+ File nullFile = null;
+ String nullString = null;
+ assertFalse(ContentTypeUtils.isSupportedImageType(nullFile));
+ assertFalse(ContentTypeUtils.isSupportedImageType(nullString));
+ }
+
+ @Test
+ public void Empty(){
+ assertFalse(ContentTypeUtils.isSupportedImageType(""));
+ }
+
+ @Test
public void Dots(){
+ assertFalse(ContentTypeUtils.isSupportedImageType(".\\."));
+ assertFalse(ContentTypeUtils.isSupportedImageType(".\\."));
+ assertFalse(ContentTypeUtils.isSupportedImageType(".\\"));
+ assertFalse(ContentTypeUtils.isSupportedImageType("\\."));
+ assertFalse(ContentTypeUtils.isSupportedImageType("."));
+ assertFalse(ContentTypeUtils.isSupportedImageType(".."));
+ assertFalse(ContentTypeUtils.isSupportedImageType("test."));
+ assertFalse(ContentTypeUtils.isSupportedImageType(".test"));
assertTrue(ContentTypeUtils.isSupportedImageType("test.png"));
assertTrue(ContentTypeUtils.isSupportedImageType(".test.png"));
assertTrue(ContentTypeUtils.isSupportedImageType("...test.png"));
assertTrue(ContentTypeUtils.isSupportedImageType(".test.test.png"));
assertFalse(ContentTypeUtils.isSupportedImageType("test.png."));
+ assertTrue(ContentTypeUtils.isSupportedImageType(new
File("test.png")));
+ assertTrue(ContentTypeUtils.isSupportedImageType(new
File(".test.png")));
+ assertTrue(ContentTypeUtils.isSupportedImageType(new
File("...test.png")));
+ assertTrue(ContentTypeUtils.isSupportedImageType(new
File(".test.test.png")));
+ assertFalse(ContentTypeUtils.isSupportedImageType(new
File("test.png.")));
}
@Test
@@ -36,6 +70,7 @@ public class ContentTypeUtilsTest {
assertTrue(ContentTypeUtils.isSupportedImageType("test.jpg"));
assertTrue(ContentTypeUtils.isSupportedImageType("test.svg"));
assertTrue(ContentTypeUtils.isSupportedImageType("test.png"));
+ assertTrue(ContentTypeUtils.isSupportedImageType("test.ico"));
}
@Test
@@ -45,6 +80,13 @@ public class ContentTypeUtilsTest {
assertFalse(ContentTypeUtils.isSupportedImageType("test.wav"));
assertFalse(ContentTypeUtils.isSupportedImageType("test.html"));
assertFalse(ContentTypeUtils.isSupportedImageType("test.png.exe"));
+ assertFalse(ContentTypeUtils.isSupportedImageType("test.htm"));
+ assertFalse(ContentTypeUtils.isSupportedImageType("test.css"));
+ assertFalse(ContentTypeUtils.isSupportedImageType("test.js"));
+ assertFalse(ContentTypeUtils.isSupportedImageType("test.xml"));
+ assertFalse(ContentTypeUtils.isSupportedImageType("test.txt"));
+
assertFalse(ContentTypeUtils.isSupportedImageType("test.xhtml"));
+ assertFalse(ContentTypeUtils.isSupportedImageType("test.xht"));
}
@Test
Modified:
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/ContentTypeUtils.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/ContentTypeUtils.java?rev=932381&r1=932380&r2=932381&view=diff
==============================================================================
---
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/ContentTypeUtils.java
(original)
+++
incubator/wookie/trunk/parser/java/src/org/apache/wookie/w3c/util/ContentTypeUtils.java
Fri Apr 9 12:29:03 2010
@@ -40,6 +40,7 @@ public class ContentTypeUtils {
* @return true if the file is a supported image type
*/
public static boolean isSupportedImageType(File file){
+ if (file == null) return false;
String type = getContentType(file);
return isSupported(type, SUPPORTED_IMAGE_TYPES);
}
@@ -73,7 +74,6 @@ public class ContentTypeUtils {
if (filename.contains(".")){
String type = null;
String[] parts = filename.split("\\.");
- if (parts.length == 0) return null;
String ext = parts[parts.length-1];
if (ext.length() != 0){
if (StringUtils.isAlpha(ext)){
