Author: olegk
Date: Sat Sep 20 11:40:41 2008
New Revision: 697406

URL: http://svn.apache.org/viewvc?rev=697406&view=rev
Log:
MIME4J-73:
* Message(InputStream), Header(InputStream) and Field.parse(String) throw a 
MimeException instead of a runtime exception
* Moved MessageBuilder into a separate public class

Added:
    
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
   (with props)
Modified:
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/field/Field.java
    james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Header.java
    
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Message.java
    
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java
    
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/ContentTransferEncodingFieldTest.java
    
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/ContentTypeFieldTest.java
    
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/FieldTest.java
    
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/UnstructuredFieldTest.java
    
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/HeaderTest.java
    
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/MessageTest.java

Modified: 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/field/Field.java
URL: 
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/field/Field.java?rev=697406&r1=697405&r2=697406&view=diff
==============================================================================
--- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/field/Field.java 
(original)
+++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/field/Field.java 
Sat Sep 20 11:40:41 2008
@@ -22,6 +22,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.james.mime4j.MimeException;
+
 /**
  * The base class of all field classes.
  *
@@ -82,7 +84,7 @@
      * @return a <code>Field</code> instance.
      * @throws IllegalArgumentException on parse errors.
      */
-    public static Field parse(final String raw) {
+    public static Field parse(final String raw) throws MimeException {
         
         /*
          * Unfold the field.
@@ -94,7 +96,7 @@
          */
         final Matcher fieldMatcher = fieldNamePattern.matcher(unfolded);
         if (!fieldMatcher.find()) {
-            throw new IllegalArgumentException("Invalid field in string");
+            throw new MimeException("Invalid field in string");
         }
         final String name = fieldMatcher.group(1);
         

Modified: 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Header.java
URL: 
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Header.java?rev=697406&r1=697405&r2=697406&view=diff
==============================================================================
--- 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Header.java 
(original)
+++ 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Header.java 
Sat Sep 20 11:40:41 2008
@@ -68,18 +68,11 @@
             public void endHeader() {
                 parser.stop();
             }
-            public void field(String fieldData) {
+            public void field(String fieldData) throws MimeException {
                 addField(Field.parse(fieldData));
             }
         });
-        try {
-            parser.parse(is);
-        } catch (MimeException e) {
-            IllegalStateException ise = new IllegalStateException(
-                    "Unexpected header processing error");
-            ise.initCause(e);
-            throw ise;
-        }
+        parser.parse(is);
     }
 
     /**

Modified: 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Message.java
URL: 
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Message.java?rev=697406&r1=697405&r2=697406&view=diff
==============================================================================
--- 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Message.java 
(original)
+++ 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/Message.java 
Sat Sep 20 11:40:41 2008
@@ -20,19 +20,12 @@
 package org.apache.james.mime4j.message;
 
 import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.decoder.Base64InputStream;
-import org.apache.james.mime4j.decoder.QuotedPrintableInputStream;
-import org.apache.james.mime4j.descriptor.BodyDescriptor;
 import org.apache.james.mime4j.field.Field;
 import org.apache.james.mime4j.field.UnstructuredField;
-import org.apache.james.mime4j.parser.ContentHandler;
 import org.apache.james.mime4j.parser.MimeStreamParser;
-import org.apache.james.mime4j.util.CharArrayBuffer;
-import org.apache.james.mime4j.util.MimeUtil;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Stack;
 
 
 /**
@@ -63,17 +56,10 @@
      * @param is the stream to parse.
      * @throws IOException on I/O errors.
      */
-    public Message(InputStream is) throws IOException {
+    public Message(InputStream is) throws MimeException, IOException {
         MimeStreamParser parser = new MimeStreamParser();
-        parser.setContentHandler(new MessageBuilder());
-        try {
-            parser.parse(is);
-        } catch (MimeException e) {
-            IllegalStateException ise = new IllegalStateException(
-                    "Unexpected message processing error");
-            ise.initCause(e);
-            throw ise;
-        }
+        parser.setContentHandler(new MessageBuilder(this));
+        parser.parse(is);
     }
 
     
@@ -87,168 +73,4 @@
         return (UnstructuredField) getHeader().getField(Field.SUBJECT);
     }
     
-    private class MessageBuilder implements ContentHandler {
-        private Stack stack = new Stack();
-        
-        public MessageBuilder() {
-        }
-        
-        private void expect(Class c) {
-            if (!c.isInstance(stack.peek())) {
-                throw new IllegalStateException("Internal stack error: "
-                        + "Expected '" + c.getName() + "' found '"
-                        + stack.peek().getClass().getName() + "'");
-            }
-        }
-        
-        /**
-         * @see org.apache.james.mime4j.parser.ContentHandler#startMessage()
-         */
-        public void startMessage() {
-            if (stack.isEmpty()) {
-                stack.push(Message.this);
-            } else {
-                expect(Entity.class);
-                Message m = new Message();
-                ((Entity) stack.peek()).setBody(m);
-                stack.push(m);
-            }
-        }
-        
-        /**
-         * @see org.apache.james.mime4j.parser.ContentHandler#endMessage()
-         */
-        public void endMessage() {
-            expect(Message.class);
-            stack.pop();
-        }
-        
-        /**
-         * @see org.apache.james.mime4j.parser.ContentHandler#startHeader()
-         */
-        public void startHeader() {
-            stack.push(new Header());
-        }
-        
-        /**
-         * @see 
org.apache.james.mime4j.parser.ContentHandler#field(java.lang.String)
-         */
-        public void field(String fieldData) {
-            expect(Header.class);
-            ((Header) stack.peek()).addField(Field.parse(fieldData));
-        }
-        
-        /**
-         * @see org.apache.james.mime4j.parser.ContentHandler#endHeader()
-         */
-        public void endHeader() {
-            expect(Header.class);
-            Header h = (Header) stack.pop();
-            expect(Entity.class);
-            ((Entity) stack.peek()).setHeader(h);
-        }
-        
-        /**
-         * @see 
org.apache.james.mime4j.parser.ContentHandler#startMultipart(org.apache.james.mime4j.descriptor.BodyDescriptor)
-         */
-        public void startMultipart(final BodyDescriptor bd) {
-            expect(Entity.class);
-            
-            final Entity e = (Entity) stack.peek();
-            final String subType = bd.getSubType();
-            final Multipart multiPart = new Multipart(subType);
-            e.setBody(multiPart);
-            stack.push(multiPart);
-        }
-        
-        /**
-         * @see 
org.apache.james.mime4j.parser.ContentHandler#body(org.apache.james.mime4j.descriptor.BodyDescriptor,
 java.io.InputStream)
-         */
-        public void body(BodyDescriptor bd, final InputStream is) throws 
IOException {
-            expect(Entity.class);
-            
-            final String enc = bd.getTransferEncoding();
-            
-            final Body body;
-            
-            final InputStream decodedStream;
-            if (MimeUtil.ENC_BASE64.equals(enc)) {
-                decodedStream = new Base64InputStream(is);
-            } else if (MimeUtil.ENC_QUOTED_PRINTABLE.equals(enc)) {
-                decodedStream = new QuotedPrintableInputStream(is);
-            } else {
-                decodedStream = is;
-            }
-            
-            if (bd.getMimeType().startsWith("text/")) {
-                body = new TempFileTextBody(decodedStream, bd.getCharset());
-            } else {
-                body = new TempFileBinaryBody(decodedStream);
-            }
-            
-            Entity entity = ((Entity) stack.peek());
-            entity.setBody(body);
-        }
-        
-        /**
-         * @see org.apache.james.mime4j.parser.ContentHandler#endMultipart()
-         */
-        public void endMultipart() {
-            stack.pop();
-        }
-        
-        /**
-         * @see org.apache.james.mime4j.parser.ContentHandler#startBodyPart()
-         */
-        public void startBodyPart() {
-            expect(Multipart.class);
-            
-            BodyPart bodyPart = new BodyPart();
-            ((Multipart) stack.peek()).addBodyPart(bodyPart);
-            stack.push(bodyPart);
-        }
-        
-        /**
-         * @see org.apache.james.mime4j.parser.ContentHandler#endBodyPart()
-         */
-        public void endBodyPart() {
-            expect(BodyPart.class);
-            stack.pop();
-        }
-        
-        /**
-         * @see 
org.apache.james.mime4j.parser.ContentHandler#epilogue(java.io.InputStream)
-         */
-        public void epilogue(InputStream is) throws IOException {
-            expect(Multipart.class);
-            CharArrayBuffer sb = new CharArrayBuffer(128);
-            int b;
-            while ((b = is.read()) != -1) {
-                sb.append((char) b);
-            }
-            ((Multipart) stack.peek()).setEpilogue(sb.toString());
-        }
-        
-        /**
-         * @see 
org.apache.james.mime4j.parser.ContentHandler#preamble(java.io.InputStream)
-         */
-        public void preamble(InputStream is) throws IOException {
-            expect(Multipart.class);
-            CharArrayBuffer sb = new CharArrayBuffer(128);
-            int b;
-            while ((b = is.read()) != -1) {
-                sb.append((char) b);
-            }
-            ((Multipart) stack.peek()).setPreamble(sb.toString());
-        }
-        
-        /**
-         * Unsupported.
-         * @see 
org.apache.james.mime4j.parser.ContentHandler#raw(java.io.InputStream)
-         */
-        public void raw(InputStream is) throws IOException {
-            throw new UnsupportedOperationException("Not supported");
-        }
-
-    }
 }

Added: 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
URL: 
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java?rev=697406&view=auto
==============================================================================
--- 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
 (added)
+++ 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
 Sat Sep 20 11:40:41 2008
@@ -0,0 +1,201 @@
+/****************************************************************
+ * 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.james.mime4j.message;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Stack;
+
+import org.apache.james.mime4j.MimeException;
+import org.apache.james.mime4j.decoder.Base64InputStream;
+import org.apache.james.mime4j.decoder.QuotedPrintableInputStream;
+import org.apache.james.mime4j.descriptor.BodyDescriptor;
+import org.apache.james.mime4j.field.Field;
+import org.apache.james.mime4j.parser.ContentHandler;
+import org.apache.james.mime4j.util.CharArrayBuffer;
+import org.apache.james.mime4j.util.MimeUtil;
+
+public class MessageBuilder implements ContentHandler {
+
+    private final Entity entity;
+    private Stack stack = new Stack();
+    
+    public MessageBuilder(Entity entity) {
+        this.entity = entity;
+    }
+    
+    private void expect(Class c) {
+        if (!c.isInstance(stack.peek())) {
+            throw new IllegalStateException("Internal stack error: "
+                    + "Expected '" + c.getName() + "' found '"
+                    + stack.peek().getClass().getName() + "'");
+        }
+    }
+    
+    /**
+     * @see org.apache.james.mime4j.parser.ContentHandler#startMessage()
+     */
+    public void startMessage() {
+        if (stack.isEmpty()) {
+            stack.push(this.entity);
+        } else {
+            expect(Entity.class);
+            Message m = new Message();
+            ((Entity) stack.peek()).setBody(m);
+            stack.push(m);
+        }
+    }
+    
+    /**
+     * @see org.apache.james.mime4j.parser.ContentHandler#endMessage()
+     */
+    public void endMessage() {
+        expect(Message.class);
+        stack.pop();
+    }
+    
+    /**
+     * @see org.apache.james.mime4j.parser.ContentHandler#startHeader()
+     */
+    public void startHeader() {
+        stack.push(new Header());
+    }
+    
+    /**
+     * @see 
org.apache.james.mime4j.parser.ContentHandler#field(java.lang.String)
+     */
+    public void field(String fieldData) throws MimeException {
+        expect(Header.class);
+        ((Header) stack.peek()).addField(Field.parse(fieldData));
+    }
+    
+    /**
+     * @see org.apache.james.mime4j.parser.ContentHandler#endHeader()
+     */
+    public void endHeader() {
+        expect(Header.class);
+        Header h = (Header) stack.pop();
+        expect(Entity.class);
+        ((Entity) stack.peek()).setHeader(h);
+    }
+    
+    /**
+     * @see 
org.apache.james.mime4j.parser.ContentHandler#startMultipart(org.apache.james.mime4j.descriptor.BodyDescriptor)
+     */
+    public void startMultipart(final BodyDescriptor bd) {
+        expect(Entity.class);
+        
+        final Entity e = (Entity) stack.peek();
+        final String subType = bd.getSubType();
+        final Multipart multiPart = new Multipart(subType);
+        e.setBody(multiPart);
+        stack.push(multiPart);
+    }
+    
+    /**
+     * @see 
org.apache.james.mime4j.parser.ContentHandler#body(org.apache.james.mime4j.descriptor.BodyDescriptor,
 java.io.InputStream)
+     */
+    public void body(BodyDescriptor bd, final InputStream is) throws 
IOException {
+        expect(Entity.class);
+        
+        final String enc = bd.getTransferEncoding();
+        
+        final Body body;
+        
+        final InputStream decodedStream;
+        if (MimeUtil.ENC_BASE64.equals(enc)) {
+            decodedStream = new Base64InputStream(is);
+        } else if (MimeUtil.ENC_QUOTED_PRINTABLE.equals(enc)) {
+            decodedStream = new QuotedPrintableInputStream(is);
+        } else {
+            decodedStream = is;
+        }
+        
+        if (bd.getMimeType().startsWith("text/")) {
+            body = new TempFileTextBody(decodedStream, bd.getCharset());
+        } else {
+            body = new TempFileBinaryBody(decodedStream);
+        }
+        
+        Entity entity = ((Entity) stack.peek());
+        entity.setBody(body);
+    }
+    
+    /**
+     * @see org.apache.james.mime4j.parser.ContentHandler#endMultipart()
+     */
+    public void endMultipart() {
+        stack.pop();
+    }
+    
+    /**
+     * @see org.apache.james.mime4j.parser.ContentHandler#startBodyPart()
+     */
+    public void startBodyPart() {
+        expect(Multipart.class);
+        
+        BodyPart bodyPart = new BodyPart();
+        ((Multipart) stack.peek()).addBodyPart(bodyPart);
+        stack.push(bodyPart);
+    }
+    
+    /**
+     * @see org.apache.james.mime4j.parser.ContentHandler#endBodyPart()
+     */
+    public void endBodyPart() {
+        expect(BodyPart.class);
+        stack.pop();
+    }
+    
+    /**
+     * @see 
org.apache.james.mime4j.parser.ContentHandler#epilogue(java.io.InputStream)
+     */
+    public void epilogue(InputStream is) throws IOException {
+        expect(Multipart.class);
+        CharArrayBuffer sb = new CharArrayBuffer(128);
+        int b;
+        while ((b = is.read()) != -1) {
+            sb.append((char) b);
+        }
+        ((Multipart) stack.peek()).setEpilogue(sb.toString());
+    }
+    
+    /**
+     * @see 
org.apache.james.mime4j.parser.ContentHandler#preamble(java.io.InputStream)
+     */
+    public void preamble(InputStream is) throws IOException {
+        expect(Multipart.class);
+        CharArrayBuffer sb = new CharArrayBuffer(128);
+        int b;
+        while ((b = is.read()) != -1) {
+            sb.append((char) b);
+        }
+        ((Multipart) stack.peek()).setPreamble(sb.toString());
+    }
+    
+    /**
+     * Unsupported.
+     * @see 
org.apache.james.mime4j.parser.ContentHandler#raw(java.io.InputStream)
+     */
+    public void raw(InputStream is) throws IOException {
+        throw new UnsupportedOperationException("Not supported");
+    }
+
+}
\ No newline at end of file

Propchange: 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/MessageBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java
URL: 
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java?rev=697406&r1=697405&r2=697406&view=diff
==============================================================================
--- 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java
 (original)
+++ 
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/message/SimpleContentHandler.java
 Sat Sep 20 11:40:41 2008
@@ -19,6 +19,7 @@
 
 package org.apache.james.mime4j.message;
 
+import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.decoder.Base64InputStream;
 import org.apache.james.mime4j.decoder.QuotedPrintableInputStream;
 import org.apache.james.mime4j.descriptor.BodyDescriptor;
@@ -72,7 +73,7 @@
     /**
      * @see 
org.apache.james.mime4j.parser.AbstractContentHandler#field(java.lang.String)
      */
-    public final void field(String fieldData) {
+    public final void field(String fieldData) throws MimeException {
         currHeader.addField(Field.parse(fieldData));
     }
 

Modified: 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/ContentTransferEncodingFieldTest.java
URL: 
http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/ContentTransferEncodingFieldTest.java?rev=697406&r1=697405&r2=697406&view=diff
==============================================================================
--- 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/ContentTransferEncodingFieldTest.java
 (original)
+++ 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/ContentTransferEncodingFieldTest.java
 Sat Sep 20 11:40:41 2008
@@ -32,7 +32,7 @@
  */
 public class ContentTransferEncodingFieldTest extends TestCase {
 
-    public void testGetEncoding() {
+    public void testGetEncoding() throws Exception {
         ContentTransferEncodingField f = null;
         
         f = (ContentTransferEncodingField) 
@@ -52,7 +52,7 @@
         assertEquals("", f.getEncoding());
     }
     
-    public void testGetEncodingStatic() {
+    public void testGetEncodingStatic() throws Exception {
         ContentTransferEncodingField f = null;
         
         f = (ContentTransferEncodingField) 

Modified: 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/ContentTypeFieldTest.java
URL: 
http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/ContentTypeFieldTest.java?rev=697406&r1=697405&r2=697406&view=diff
==============================================================================
--- 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/ContentTypeFieldTest.java
 (original)
+++ 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/ContentTypeFieldTest.java
 Sat Sep 20 11:40:41 2008
@@ -38,14 +38,14 @@
         BasicConfigurator.configure();
     }
     
-    public void testMimeTypeWithSemiColonNoParams() {
+    public void testMimeTypeWithSemiColonNoParams() throws Exception  {
         ContentTypeField f = null;
         
         f = (ContentTypeField) Field.parse("Content-Type: text/html;");
         assertEquals("text/html", f.getMimeType());
     }
     
-    public void testGetMimeType() {
+    public void testGetMimeType() throws Exception {
         ContentTypeField f = null;
         
         f = (ContentTypeField) Field.parse("Content-Type: text/PLAIN");
@@ -62,7 +62,7 @@
         assertEquals("", f.getMimeType());
     }
     
-    public void testGetMimeTypeStatic() {
+    public void testGetMimeTypeStatic() throws Exception {
         ContentTypeField child = null;
         ContentTypeField parent = null;
         
@@ -83,7 +83,7 @@
         assertEquals("message/rfc822", ContentTypeField.getMimeType(child, 
parent));
     }
     
-    public void testGetCharsetStatic() {
+    public void testGetCharsetStatic() throws Exception {
         ContentTypeField f = null;
         
         f = (ContentTypeField) Field.parse("Content-Type: some/type; 
charset=iso8859-1");
@@ -93,7 +93,7 @@
         assertEquals("us-ascii", ContentTypeField.getCharset(f));
     }
     
-    public void testGetParameter() {
+    public void testGetParameter() throws Exception {
         ContentTypeField f = null;
         
         f = (ContentTypeField) Field.parse("CONTENT-TYPE:   text / html ;"

Modified: 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/FieldTest.java
URL: 
http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/FieldTest.java?rev=697406&r1=697405&r2=697406&view=diff
==============================================================================
--- 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/FieldTest.java 
(original)
+++ 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/FieldTest.java 
Sat Sep 20 11:40:41 2008
@@ -19,6 +19,7 @@
 
 package org.apache.james.mime4j.field;
 
+import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.field.ContentTransferEncodingField;
 import org.apache.james.mime4j.field.ContentTypeField;
 import org.apache.james.mime4j.field.Field;
@@ -34,7 +35,7 @@
  */
 public class FieldTest extends TestCase {
 
-    public void testGetName() {
+    public void testGetName() throws Exception {
         Field f = null;
         
         f = Field.parse("Subject: Yada yada yada");
@@ -45,13 +46,13 @@
         
         try {
             f = Field.parse("Yada yada yada");
-            fail("IllegalArgumentException not thrown when using an invalid "
+            fail("MimeException not thrown when using an invalid "
                     + "field");
-        } catch (IllegalArgumentException e) {
+        } catch (MimeException e) {
         }
     }
 
-    public void testParse() {
+    public void testParse() throws Exception {
         Field f = null;
         
         f = Field.parse("Subject: Yada yada yada");

Modified: 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/UnstructuredFieldTest.java
URL: 
http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/UnstructuredFieldTest.java?rev=697406&r1=697405&r2=697406&view=diff
==============================================================================
--- 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/UnstructuredFieldTest.java
 (original)
+++ 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/field/UnstructuredFieldTest.java
 Sat Sep 20 11:40:41 2008
@@ -32,7 +32,7 @@
  */
 public class UnstructuredFieldTest extends TestCase {
 
-    public void testGetBody() {
+    public void testGetBody() throws Exception {
         UnstructuredField f = null;
         
         f = (UnstructuredField) Field.parse("Subject: Yada\r\n yada yada\r\n");

Modified: 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/HeaderTest.java
URL: 
http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/HeaderTest.java?rev=697406&r1=697405&r2=697406&view=diff
==============================================================================
--- 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/HeaderTest.java
 (original)
+++ 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/HeaderTest.java
 Sat Sep 20 11:40:41 2008
@@ -33,7 +33,7 @@
 
     public static final String TO = "To: anyuser <[EMAIL PROTECTED]>";
 
-    public void testHeader() {
+    public void testHeader() throws Exception {
         Header header = new Header();
         header.addField(Field.parse(SUBJECT));
         header.addField(Field.parse(TO));

Modified: 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/MessageTest.java
URL: 
http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/MessageTest.java?rev=697406&r1=697405&r2=697406&view=diff
==============================================================================
--- 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/MessageTest.java
 (original)
+++ 
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/message/MessageTest.java
 Sat Sep 20 11:40:41 2008
@@ -45,7 +45,7 @@
     private Header headerMultipartMixed = null;
     private Header headerMultipartDigest = null;
 
-    public void setUp() {
+    public void setUp() throws Exception {
         headerTextPlain = new Header();
         headerMessageRFC822 = new Header();
         headerEmpty = new Header();



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

Reply via email to