Author: sgoeschl
Date: Sun Oct 31 23:19:59 2010
New Revision: 1029514
URL: http://svn.apache.org/viewvc?rev=1029514&view=rev
Log:
Improving tests
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java
commons/proper/email/trunk/src/test/html/www.apache.org.html
commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailLiveTest.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java?rev=1029514&r1=1029513&r2=1029514&view=diff
==============================================================================
---
commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java
(original)
+++
commons/proper/email/trunk/src/java/org/apache/commons/mail/MultiPartEmail.java
Sun Oct 31 23:19:59 2010
@@ -499,6 +499,7 @@ public class MultiPartEmail extends Emai
BodyPart bodyPart = new MimeBodyPart();
return bodyPart;
}
+
/**
* Creates a mime multipart object.
*
@@ -509,7 +510,7 @@ public class MultiPartEmail extends Emai
MimeMultipart mmp = new MimeMultipart();
return mmp;
}
-
+
/**
* Checks whether there are attachments.
*
Modified: commons/proper/email/trunk/src/test/html/www.apache.org.html
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/html/www.apache.org.html?rev=1029514&r1=1029513&r2=1029514&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/html/www.apache.org.html (original)
+++ commons/proper/email/trunk/src/test/html/www.apache.org.html Sun Oct 31
23:19:59 2010
@@ -20,257 +20,7 @@
-->
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
- <!--
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- This file is generated from XML source: DO NOT EDIT!
- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- -->
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <link rel="stylesheet" href="./style/compressed.css" type="text/css"
media="screen, projection"/>
- <link rel="stylesheet" href="./style/style.css" type="text/css"
media="screen, projection"/>
- <!--[if IE]><link rel="stylesheet" href="./style/ie.css"
type="text/css" media="screen, projection"/><![endif]-->
-<link rel="alternate" title="[email protected] Archives"
type="application/atom+xml"
href="http://mail-archives.apache.org/mod_mbox/www-announce/?format=atom"; />
- <meta name="author" content="The Apache Software Foundation" /><meta
name="email" content="apache.AT.apache.DOT.org" />
- <title>Welcome! - The Apache Software Foundation</title>
-
- </head>
<body>
- <div class="navigation">
- <ul>
- <li><a href="./foundation" title="About the
Foundation">Foundation</a></li>
- <li><a href="http://projects.apache.org"; title="Apache
Projects">Projects</a></li>
- <li><a href="http://people.apache.org"; title="Apache
People">People</a></li>
- <li><a href="./foundation/getinvolved.html" title="Get
involved in Apache">Get Involved</a></li>
- <li><a href="./foundation/support-apache.html"
title="Support the mission of Apache">Support Apache</a></li>
- <li class="dlink"><a href="./dyn/closer.cgi"
title="Download Apache projects">Download</a></li>
- <li><a href="http://blogs.apache.org/foundation/";
title="Foundation Blog">ASF Blog</a></li>
- </ul>
- </div>
- <div class="container">
- <hr class="space col"/>
- <div class="block">
- <div class="column span-24">
- <div id="header">
- <h1>The Apache Software Foundation<br />
- <span class="alt"><small>Celebrating a Decade of Open Source
Leadership.</small></span></h1><p class="blurb">The Apache Software Foundation
provides support for the Apache community of open-source software projects.
The <a href="http://projects.apache.org/";>Apache projects</a> are characterized
by a collaborative, consensus based development process, an open and pragmatic
software license, and a desire to create high quality software that leads the
way in its field.</p><p class="highlight">We are more than a group of projects
sharing a server, we are a <em>community</em> of developers and users.</p>
- </div>
- </div>
- </div>
- <hr/>
- <div class="block">
- <div class="column span-15 first append-1">
- <h3>
- Want to speak at ApacheCon NA 2010?
- </h3>
- </div>
- <div class="column span-8 las search">
- <form action="http://www.google.com/search";
method="get">
- <input value="*.apache.org" name="sitesearch"
type="hidden"/>
- <input size="10" name="q" id="query" type="text"/>
- <input name="Search" value="Go" type="submit"/>
- </form>
- </div>
- </div>
- <div class="block content">
- <div class="column span-15 colborder">
-
-<div class="section-content">
-<p><a href="http://na.apachecon.com/c/acna2010/";>ApacheCon NA 2010</a> returns
to Atlanta this year on 1-5 November, and the
-<a href="http://blogs.apache.org/conferences/date/20100428";>Call for
Participation for technical talks</a> is now open!
-We're looking to have a better conference than ever, including tracks planned
by our PMCs as well
-as your technical session submissions. CFP ends 28-May!</p>
-</div>
-
-<h4 id="news">
- Latest News
-</h4>
-<div class="section-content">
-<p><em>If you would like to keep up with news and announcements from the
foundation and all its projects, you can subscribe to the <a
href="foundation/mailinglists.html#foundation-announce">Apache Announcements
List</a> or you can visit <a href="https://blogs.apache.org/foundation/";>our
foundation blog</a></em>. Latest blog entries:</p>
-<div id="latestnews">
-<p>
-<a
href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces5";>The
Apache Software Foundation Announces Apache Tomcat Version 7.0</a>
-<br /><i>Posted at: 1:16 PM Jun 29, 2010</i></p>
-
-<p>
-<a
href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces4";>The
Apache Software Foundation Announces New Top-Level Projects</a>
-<br /><i>Posted at: 12:09 PM May 4, 2010</i></p>
-
-<p>
-<a
href="https://blogs.apache.org/foundation/entry/call_for_participation_technical_talks";>Call
for Participation: Technical Talks -- ApacheCon North America 2010</a>
-<br /><i>Posted at: 5:52 PM Apr 28, 2010</i></p>
-
-<p>
-<a
href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces3";>The
Apache Software Foundation Announces Apache Cassandra Release 0.6</a>
-<br /><i>Posted at: 1:05 PM Apr 13, 2010</i></p>
-
-<p>
-<a
href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_receives";>The
Apache Software Foundation Receives Approval for Sale to Oracle Corporation</a>
-<br /><i>Posted at: 11:59 AM Apr 1, 2010</i></p>
-</div>
-</div>
- </div>
- <div class="column span-8 last">
- <div class="block">
- <div class="nav column span-11">
- <div>
- <div class="menuheader"><a
-href="http://projects.apache.org/";>Apache Projects</a></div>
- <ul>
- <li><a href="http://httpd.apache.org/"; title="Apache Web Server
(httpd)">HTTP Server</a></li>
- <li><a href="http://abdera.apache.org/"; title="Atom Publishing
Protocol Implementation">Abdera</a></li>
- <li><a href="http://activemq.apache.org/"; title="Distributed
Messaging System">ActiveMQ</a></li>
- <li><a href="http://ant.apache.org/"; title="Java-based build
tool">Ant</a></li>
- <li><a href="http://apr.apache.org/"; title="Apache Portable Runtime
libraries">APR</a></li>
- <li><a href="http://archiva.apache.org/"; title="Build Artifact
Repository Manager">Archiva</a></li>
- <li><a href="http://avro.apache.org/"; title="A Serialization
System">Avro</a></li>
- <li><a href="http://buildr.apache.org/"; title="Simple and intuitive
build system for Java applications">Buildr</a></li>
- <li><a href="http://camel.apache.org/"; title="Spring based
Integration Framework which implements the Enterprise Integration
Patterns">Camel</a></li>
- <li><a href="http://cassandra.apache.org/"; title="Highly scalable
second-generation distributed database">Cassandra</a></li>
- <li><a href="http://cayenne.apache.org/"; title="User-friendly Java
ORM with Tools">Cayenne</a></li>
- <li><a href="http://click.apache.org/"; title="User-friendly page and
component oriented web framework">Click</a></li>
- <li><a href="http://cocoon.apache.org/"; title="Web development
framework: separation of concerns, component-based">Cocoon</a></li>
- <li><a href="http://commons.apache.org/"; title="Reusable Java
components">Commons</a></li>
- <li><a href="http://continuum.apache.org/"; title="Continuous
Integration and Build Server">Continuum</a></li>
- <li><a href="http://couchdb.apache.org/"; title="RESTful document
database">CouchDB</a></li>
- <li><a href="http://cxf.apache.org/"; title="Service
Framework">CXF</a></li>
- <li><a href="http://db.apache.org/"; title="Database
access">DB</a></li>
- <li><a href="http://directory.apache.org/"; title="Apache Directory
Server">Directory</a></li>
- <li><a href="http://excalibur.apache.org/"; title="Embeddable
software libraries related to component and service management
access">Excalibur</a></li>
- <li><a href="http://felix.apache.org/"; title="OSGi Framework and
components.">Felix</a></li>
- <li><a href="http://forrest.apache.org/"; title="Aggregated
multi-channel documentation, separation of concerns">Forrest</a></li>
- <li><a href="http://geronimo.apache.org/"; title="Java2, Enterprise
Edition (J2EE) container">Geronimo</a></li>
- <li><a href="http://gump.apache.org/"; title="Continuous integration
of open source projects">Gump</a></li>
- <li><a href="http://hadoop.apache.org/"; title="Distributed computing
platform">Hadoop</a></li>
- <li><a href="http://harmony.apache.org/"; title="Open source
implementation of Java SE">Harmony</a></li>
- <li><a href="http://hbase.apache.org/"; title="Hadoop
Database">HBase</a></li>
- <li><a href="http://hc.apache.org/"; title="Java toolset of low level
HTTP components">HttpComponents</a></li>
- <li><a href="http://jackrabbit.apache.org/"; title="Content
Repository for Java">Jackrabbit</a></li>
- <li><a href="http://jakarta.apache.org/"; title="Server-side
Java">Jakarta</a></li>
- <li><a href="http://james.apache.org/"; title="Java Apache Mail
Enterprise Server">James</a></li>
- <li><a href="http://lenya.apache.org/"; title="Content Management
System">Lenya</a></li>
- <li><a href="http://logging.apache.org/"; title="Cross-language
logging services">Logging</a></li>
- <li><a href="http://lucene.apache.org/"; title="Search engine
library">Lucene</a></li>
- <li><a href="http://mahout.apache.org/"; title="Scalable machine
learning library">Mahout</a></li>
- <li><a href="http://maven.apache.org/"; title="Java project
management and comprehension tools">Maven</a></li>
- <li><a href="http://mina.apache.org/"; title="Multipurpose
Infrastructure for Network Application">Mina</a></li>
- <li><a href="http://myfaces.apache.org/"; title="JavaServer(tm) Faces
implementation and components">MyFaces</a></li>
- <li><a href="http://nutch.apache.org/"; title="Open Source Web Search
Software">Nutch</a></li>
- <li><a href="http://ode.apache.org/"; title="Orchestration Director
Engine: Business Process Management (BPM), Process Orchestration and Workflow
through service compositioni.">ODE</a></li>
- <li><a href="http://ofbiz.apache.org/"; title="Open for Business:
enterprise automation software">OFBiz</a></li>
- <li><a href="http://openejb.apache.org/"; title="OpenEJB: a modular,
configurable, and extendable EJB Container System and Server">OpenEJB</a></li>
- <li><a href="http://openjpa.apache.org/"; title="OpenJPA: Object
Relational Mapping for Java">OpenJPA</a></li>
- <li><a href="http://openwebbeans.apache.org/"; title="OpenWebBeans:
JSR-299 Context and Dependency Injection for Java EE Platform
Implementation">OpenWebBeans</a></li>
- <li><a href="http://pdfbox.apache.org/"; title="Java library for
working with PDF documents">PDFBox</a></li>
- <li><a href="http://perl.apache.org/"; title="Dynamic websites using
Perl">Perl</a></li>
- <li><a href="http://pivot.apache.org/"; title="Rich Internet
applications in Java">Pivot</a></li>
- <li><a href="http://poi.apache.org/"; title="Java API for OLE 2
Compound Documents">POI</a></li>
- <li><a href="http://portals.apache.org/"; title="Portal
technology">Portals</a></li>
- <li><a href="http://qpid.apache.org/"; title="Multiple language
implementation of the latest Advanced Message Queuing Protocol
(AMQP)">Qpid</a></li>
- <li><a href="http://roller.apache.org/"; title="Java blog
server">Roller</a></li>
- <li><a href="http://santuario.apache.org/"; title="XML Security in
Java and C++">Santuario</a></li>
- <li><a href="http://servicemix.apache.org/"; title="Enterprise
Service Bus">ServiceMix</a></li>
- <li><a href="http://shindig.apache.org/"; title="Opensocial Reference
Implementation">Shindig</a></li>
- <li><a href="http://sling.apache.org/"; title="Web Framework for JCR
Content Repositories">Sling</a></li>
- <li><a href="http://spamassassin.apache.org/"; title="Mail filter to
identify spam">SpamAssassin</a></li>
- <li><a href="http://stdcxx.apache.org/"; title="Apache C++ Standard
Library">STDCXX</a></li>
- <li><a href="http://struts.apache.org/"; title="Model 2 framework for
building Java web applications">Struts</a></li>
- <li><a href="http://subversion.apache.org/"; title="Version
Control">Subversion</a></li>
- <li><a href="http://synapse.apache.org/"; title="Enterprise Service
Bus and Mediation Framework">Synapse</a></li>
- <li><a href="http://tapestry.apache.org/"; title="Component-based
Java Web Application Framework">Tapestry</a></li>
- <li><a href="http://tika.apache.org"; title="Content Analysis and
Detection Toolkit">Tika</a></li>
- <li><a href="http://tcl.apache.org/"; title="Dynamic websites using
TCL">TCL</a></li>
- <li><a href="http://tiles.apache.org/"; title="A templating framework
for web application user interfaces">Tiles</a></li>
- <li><a href="http://tomcat.apache.org/"; title="A Java Servlet and
JSP Container">Tomcat</a></li>
- <li><a href="http://trafficserver.apache.org/"; title="A fast,
scalable and extensible HTTP/1.1 compliant caching proxy
server">TrafficServer</a></li>
- <li><a href="http://turbine.apache.org/"; title="A Java Servlet Web
Application Framework and associated component library">Turbine</a></li>
- <li><a href="http://tuscany.apache.org/"; title="An SCA based Service
Composition Framework">Tuscany</a></li>
- <li><a href="http://uima.apache.org/"; title="Framework and
annotators for unstructured information analysis">UIMA</a></li>
- <li><a href="http://velocity.apache.org/"; title="A Java Templating
Engine">Velocity</a></li>
- <li><a href="http://wicket.apache.org/"; title="Component-based Java
Web Application Framework.">Wicket</a></li>
- <li><a href="http://ws.apache.org/";>Web Services</a></li>
- <li><a href="http://xalan.apache.org/"; title="XSLT processors in
Java and C++">Xalan</a></li>
- <li><a href="http://xerces.apache.org/"; title="XML parsers in Java,
C++ and Perl">Xerces</a></li>
- <li><a href="http://xml.apache.org/"; title="XML solutions focused on
the web">XML</a></li>
- <li><a href="http://xmlbeans.apache.org/"; title="XML-Java binding
tool">XMLBeans</a></li>
- <li><a href="http://xmlgraphics.apache.org/"; title="Conversion from
XML to graphical output">XML Graphics</a></li>
- </ul>
- </div>
- </div>
- <div class="nav column prepend-1 span-12 last">
- <h6><a
-href="/foundation/">Foundation</a></h6>
- <ul>
- <li><a href="/foundation/faq.html">FAQ</a></li>
- <li><a href="/licenses/">Licenses</a></li>
- <li><a href="/foundation/news.html">News</a></li>
- <li><a href="http://blogs.apache.org/foundation/";>Blog</a></li>
- <li><a href="/foundation/records/">Public Records</a></li>
- <li><a href="/press/">Press Inquiries</a></li>
- <li><a href="/foundation/contact.html">Contact</a></li>
- </ul>
- <h6><a
-href="/foundation/support-apache.html">Support Apache</a></h6>
- <ul>
- <li><a href="/foundation/sponsorship.html">Sponsorship</a></li>
- <li><a href="/foundation/contributing.html">Donations</a></li>
- <li><a href="/foundation/buy_stuff.html">Buy Stuff</a></li>
- <li><a href="/foundation/thanks.html">Thanks</a></li>
- </ul>
- <h6><a
-href="/foundation/foundation-projects.html">Foundation Projects</a></h6>
- <ul>
- <li><a href="http://attic.apache.org/"; title="Inactive project
repository">Attic</a></li>
- <li><a href="/foundation/conferences.html" title="Meetings of
developers and users">Conferences</a></li>
- <li><a href="http://community.apache.org/"; title="Helping newcomers
to the ASF">Community Development</a></li>
- <li><a href="http://incubator.apache.org/"; title="Shepherd for new
projects">Incubator</a></li>
- <li><a href="/dev/infrastructure.html" title="Upholding the
Foundation">Infrastructure</a></li>
- <li><a href="/jcp/" title="Apache and the Java Community
Process">JCP</a></li>
- <li><a href="http://labs.apache.org/"; title="The Innovation
Laboratories of the Apache Software Foundation">Labs</a></li>
- <li><a href="/legal/" title="Legal Affairs">Legal Affairs</a></li>
- <li><a href="/security/" title="Security">Security</a></li>
- <li><a href="/travel/" title="Travel Assistance">Travel
Assistance</a></li>
- </ul>
- <h6>How it works</h6>
- <ul>
- <li><a href="/foundation/how-it-works.html">Introduction</a></li>
- <li><a
href="/foundation/how-it-works.html#meritocracy">Meritocracy</a></li>
- <li><a
href="/foundation/how-it-works.html#structure">Structure</a></li>
- <li><a href="/foundation/how-it-works.html#roles">Roles</a></li>
- <li><a
href="/foundation/how-it-works.html#management">Collaboration</a></li>
- <li><a
href="/foundation/how-it-works.html#incubator">Incubator</a></li>
- <li><a href="/foundation/how-it-works.html#other">Other
entities</a></li>
- <li><a href="/foundation/glossary.html">Glossary</a></li>
- <li><a href="/foundation/voting.html">Voting</a></li>
- </ul>
- <h6><a
-href="/foundation/getinvolved.html">Get Involved</a></h6>
- <ul>
- <li><a href="/dyn/closer.cgi">Download</a></li>
- <li><a href="/foundation/mailinglists.html">Mailing Lists</a></li>
- <li><a href="/dev/version-control.html">Version Control</a></li>
- <li><a href="/dev/" title="Operations and howto documents for PMCs
and contributors">Developer Info</a></li>
- </ul>
- <h6>Community</h6>
- <ul>
- <li><a href="http://people.apache.org/";>People</a></li>
- <li><a href="/memorials/">Memorials</a></li>
- <li><a href="http://feathercast.org/"; title="Apache
Podcasts">Feathercast</a></li>
- <li><a href="http://blogs.apache.org/"; title="Apache Project
Blogs">Project Blogs</a></li>
- <li><a href="http://planet.apache.org/committers/"; title="Apache
Committers' Blogs">PlanetApache</a></li>
- </ul>
- <h6></h6>
- <ul>
- </ul>
- </div>
- </div>
- </div>
- <div class="column span-24 footer">
- <hr/>
- <p>Copyright © 2010 The Apache Software Foundation, Licensed
under the <a href="http://www.apache.org/licenses/LICENSE-2.0";>Apache License,
Version 2.0</a>.<br/>
- Apache and the Apache feather logo are trademarks of The Apache
Software Foundation.</p>
- </div>
- </div>
- </div>
-</body>
-</html>
-
+ <b>This is a HTML message with an inline image - <img
src="../images/asf_logo_wide.gif"/> and NO attachment</b>
+ </body>
+</html>
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailLiveTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailLiveTest.java?rev=1029514&r1=1029513&r2=1029514&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailLiveTest.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/EmailLiveTest.java
Sun Oct 31 23:19:59 2010
@@ -98,6 +98,7 @@ public class EmailLiveTest extends BaseE
email.setSSL(EmailConfiguration.MAIL_USE_SSL);
email.setHostName(EmailConfiguration.MAIL_SERVER);
email.setSmtpPort(EmailConfiguration.MAIL_SERVER_PORT);
+ email.setBounceAddress(EmailConfiguration.TEST_FROM);
email.setDebug(EmailConfiguration.MAIL_DEBUG);
email.setCharset(EmailConfiguration.MAIL_CHARSET);
email.setFrom(EmailConfiguration.TEST_FROM);
@@ -245,8 +246,7 @@ public class EmailLiveTest extends BaseE
*/
public void testImageHtmlEmailLocal() throws Exception
{
- // use a simple HTML page with one image - please note that the Apache
logo
- // is defined in CSS and not in HTML.
+ // use a simple HTML page with one image
File htmlFile = new File("./src/test/html/www.apache.org.html");
String htmlMsg1 = FileUtils.readFileToString(htmlFile);
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java?rev=1029514&r1=1029513&r2=1029514&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/MultiPartEmailTest.java
Sun Oct 31 23:19:59 2010
@@ -196,6 +196,7 @@ public class MultiPartEmailTest extends
public void testAttach() throws MalformedURLException, EmailException
{
EmailAttachment attachment;
+
// ====================================================================
// Test Success - File
// ====================================================================
@@ -204,6 +205,7 @@ public class MultiPartEmailTest extends
attachment.setDescription("Test Attachment Desc");
attachment.setPath(testFile.getAbsolutePath());
this.email.attach(attachment);
+ assertTrue(this.email.isBoolHasAttachments());
// ====================================================================
// Test Success - URL
