Author: rdonkin
Date: Sat Jun 21 03:34:50 2008
New Revision: 670177
URL: http://svn.apache.org/viewvc?rev=670177&view=rev
Log:
Use a single superclass to test both implementation of BodyDescriptor
Added:
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BaseTestForBodyDescriptors.java
(contents, props changed)
- copied, changed from r670166,
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BodyDescriptorTest.java
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/DefaultBodyDescriptorTest.java
Removed:
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BodyDescriptorTest.java
Modified:
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MaximalBodyDescriptorTest.java
Copied:
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BaseTestForBodyDescriptors.java
(from r670166,
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BodyDescriptorTest.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BaseTestForBodyDescriptors.java?p2=james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BaseTestForBodyDescriptors.java&p1=james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BodyDescriptorTest.java&r1=670166&r2=670177&rev=670177&view=diff
==============================================================================
---
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BodyDescriptorTest.java
(original)
+++
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BaseTestForBodyDescriptors.java
Sat Jun 21 03:34:50 2008
@@ -24,15 +24,11 @@
/**
* @version $Id: BodyDescriptorTest.java,v 1.2 2004/10/02 12:41:11 ntherning
Exp $
*/
-public class BodyDescriptorTest extends TestCase {
+public abstract class BaseTestForBodyDescriptors extends TestCase {
- protected MutableBodyDescriptor newBodyDescriptor() {
- return new DefaultBodyDescriptor();
- }
+ protected abstract MutableBodyDescriptor newBodyDescriptor();
- protected MutableBodyDescriptor newBodyDescriptor(BodyDescriptor parent) {
- return new DefaultBodyDescriptor(parent);
- }
+ protected abstract MutableBodyDescriptor newBodyDescriptor(BodyDescriptor
parent);
public void testGetParameters() {
MutableBodyDescriptor bd = null;
Propchange:
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BaseTestForBodyDescriptors.java
------------------------------------------------------------------------------
svn:mergeinfo =
Added:
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/DefaultBodyDescriptorTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/DefaultBodyDescriptorTest.java?rev=670177&view=auto
==============================================================================
---
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/DefaultBodyDescriptorTest.java
(added)
+++
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/DefaultBodyDescriptorTest.java
Sat Jun 21 03:34:50 2008
@@ -0,0 +1,29 @@
+/*
+ * 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;
+
+public class DefaultBodyDescriptorTest extends BaseTestForBodyDescriptors {
+ protected MutableBodyDescriptor newBodyDescriptor() {
+ return new DefaultBodyDescriptor();
+ }
+
+ protected MutableBodyDescriptor newBodyDescriptor(BodyDescriptor parent) {
+ return new DefaultBodyDescriptor(parent);
+ }
+}
Modified:
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MaximalBodyDescriptorTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MaximalBodyDescriptorTest.java?rev=670177&r1=670176&r2=670177&view=diff
==============================================================================
---
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MaximalBodyDescriptorTest.java
(original)
+++
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/MaximalBodyDescriptorTest.java
Sat Jun 21 03:34:50 2008
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
-public class MaximalBodyDescriptorTest extends TestCase {
+public class MaximalBodyDescriptorTest extends BaseTestForBodyDescriptors {
MimeTokenStream parser;
@@ -86,4 +86,12 @@
assertTrue("Parser is maximal so body descriptor should be maximal",
descriptor instanceof MaximalBodyDescriptor);
return (MaximalBodyDescriptor) descriptor;
}
+
+ protected MutableBodyDescriptor newBodyDescriptor() {
+ return new MaximalBodyDescriptor();
+ }
+
+ protected MutableBodyDescriptor newBodyDescriptor(BodyDescriptor parent) {
+ return new MaximalBodyDescriptor(parent);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
