You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2013/08/05 19:39:53 UTC
svn commit: r1510621 -
/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java
Author: britter
Date: Mon Aug 5 17:39:52 2013
New Revision: 1510621
URL: http://svn.apache.org/r1510621
Log:
Move initialization to set up method
Modified:
commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java
Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java?rev=1510621&r1=1510620&r2=1510621&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/resolver/DataSourceCompositeResolverTest.java Mon Aug 5 17:39:52 2013
@@ -19,6 +19,7 @@ package org.apache.commons.mail.resolver
import static org.junit.Assert.*;
import org.apache.commons.mail.DataSourceResolver;
+import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
@@ -31,12 +32,20 @@ import java.net.URL;
*/
public class DataSourceCompositeResolverTest extends AbstractDataSourceResolverTest
{
+
+ private DataSourceResolver[] dataSourceResolvers;
+
+ @Before
+ public void setUp() throws Exception
+ {
+ DataSourceUrlResolver urlResolver = new DataSourceUrlResolver(new URL("http://www.apache.org"), false);
+ DataSourceClassPathResolver classPathResolver = new DataSourceClassPathResolver("/images", false);
+ dataSourceResolvers = new DataSourceResolver[] { urlResolver, classPathResolver };
+ }
+
@Test
public void testResolvingFilesLenient() throws Exception
{
- DataSourceResolver urlResolver = new DataSourceUrlResolver(new URL("http://www.apache.org"), false);
- DataSourceResolver classPathResolver = new DataSourceClassPathResolver("/images", false);
- DataSourceResolver[] dataSourceResolvers = new DataSourceResolver[] { urlResolver, classPathResolver };
DataSourceResolver dataSourceResolver = new DataSourceCompositeResolver(dataSourceResolvers, true);
// resolve using HTTP
@@ -49,9 +58,6 @@ public class DataSourceCompositeResolver
@Test
public void testResolvingFilesNonLenient() throws Exception
{
- DataSourceResolver urlResolver = new DataSourceUrlResolver(new URL("http://www.apache.org"), false);
- DataSourceResolver classPathResolver = new DataSourceClassPathResolver("/images", false);
- DataSourceResolver[] dataSourceResolvers = new DataSourceResolver[] { urlResolver, classPathResolver };
DataSourceResolver dataSourceResolver = new DataSourceCompositeResolver(dataSourceResolvers, false);
try
@@ -69,9 +75,6 @@ public class DataSourceCompositeResolver
@Test
public void testExternalModification() throws Exception
{
- DataSourceResolver urlResolver = new DataSourceUrlResolver(new URL("http://www.apache.org"), false);
- DataSourceResolver classPathResolver = new DataSourceClassPathResolver("/images", false);
- DataSourceResolver[] dataSourceResolvers = new DataSourceResolver[] { urlResolver, classPathResolver };
DataSourceCompositeResolver dataSourceResolver = new DataSourceCompositeResolver(dataSourceResolvers, true);
DataSourceResolver[] arr = dataSourceResolver.getDataSourceResolvers();