svn commit: r527587 - in /jakarta/turbine/core/branches/TURBINE_2_3_BRANCH: project.xml src/test/org/apache/turbine/util/parser/DefaultParameterParserTest.java

[tv]

Author: tv
Date: Wed Apr 11 10:48:25 2007
New Revision: 527587

URL: http://svn.apache.org/viewvc?view=rev&rev=527587
Log:
Fix dependencies on commons-fileupload and adjust test

Modified:
    jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml
    
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/parser/DefaultParameterParserTest.java

Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml?view=diff&rev=527587&r1=527586&r2=527587
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/project.xml Wed Apr 11 
10:48:25 2007
@@ -213,6 +213,16 @@
       <email>[EMAIL PROTECTED]</email>
       <organization>CollabNet, Inc.</organization>
     </developer>
+    <developer>
+      <name>Thomas Vandahl</name>
+      <id>tv</id>
+      <email>[EMAIL PROTECTED]</email>
+      <organization>TeWiSoft GmbH</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>2</timezone>
+    </developer>
   </developers>
 
   <contributors>
@@ -361,10 +371,6 @@
       <email>[EMAIL PROTECTED]</email>
     </contributor>
     <contributor>
-      <name>Thomas Vandahl</name>
-      <email>[EMAIL PROTECTED]</email>
-    </contributor>
-    <contributor>
       <name>Scott Weaver</name>
       <email>[EMAIL PROTECTED]</email>
     </contributor>
@@ -472,8 +478,18 @@
     <dependency>
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
-      <version>1.0</version>
+      <version>1.2</version>
       <url>http://jakarta.apache.org/commons/fileupload/</url>
+      <type>jar</type>
+      <properties>
+        <dist.bundle>true</dist.bundle>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.3.1</version>
+      <url>http://jakarta.apache.org/commons/io/</url>
       <type>jar</type>
       <properties>
         <dist.bundle>true</dist.bundle>

Modified: 
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/parser/DefaultParameterParserTest.java
URL: 
http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/parser/DefaultParameterParserTest.java?view=diff&rev=527587&r1=527586&r2=527587
==============================================================================
--- 
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/parser/DefaultParameterParserTest.java
 (original)
+++ 
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/parser/DefaultParameterParserTest.java
 Wed Apr 11 10:48:25 2007
@@ -16,6 +16,8 @@
  * limitations under the License.
  */
 
+import java.io.File;
+import java.io.IOException;
 import java.util.Iterator;
 
 import junit.framework.TestSuite;
@@ -76,15 +78,19 @@
         assertFalse(pp.containsKey("missing-field"));
     }
 
-    public void testToString()
+    public void testToString() throws IOException
     {
         ParameterParser pp = new DefaultParameterParser();
-        DiskFileItemFactory factory = new DiskFileItemFactory(10240, null);
+        DiskFileItemFactory factory = new DiskFileItemFactory(10240, new 
File("."));
 
         FileItem test = factory.createItem("upload-field", 
"application/octet-stream", false, null);
+        
+        // Necessary to avoid a NullPointerException in toString()
+        test.getOutputStream();
+        
         pp.add("upload-field", test);
 
-        
assertTrue(pp.toString().startsWith("{upload-field=[org.apache.commons.fileupload.DefaultFileItem"));
+        assertTrue(pp.toString().startsWith("{upload-field=[name=null,"));
     }
 }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]