Author: ieugen
Date: Sun Mar 11 23:33:23 2012
New Revision: 1299487
URL: http://svn.apache.org/viewvc?rev=1299487&view=rev
Log:
JAMES-1393
- updated tests to juni 4.x style
- added @Override and reformated code
Issue #JAMES-1393 - Upgrate all test suites to junit 4.10
Modified:
james/server/trunk/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
james/server/trunk/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
james/server/trunk/data-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
james/server/trunk/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
james/server/trunk/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
Modified:
james/server/trunk/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java?rev=1299487&r1=1299486&r2=1299487&view=diff
==============================================================================
---
james/server/trunk/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
(original)
+++
james/server/trunk/data-file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java
Sun Mar 11 23:33:23 2012
@@ -16,99 +16,104 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
package org.apache.james.domainlist.xml;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
-
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.mock.MockDNSService;
-import org.apache.james.domainlist.xml.XMLDomainList;
+import static org.junit.Assert.*;
+import org.junit.Test;
import org.slf4j.LoggerFactory;
-import junit.framework.TestCase;
-
-public class XMLDomainListTest extends TestCase {
+public class XMLDomainListTest {
private HierarchicalConfiguration setUpConfiguration(boolean auto, boolean
autoIP, List<String> names) {
- DefaultConfigurationBuilder configuration = new
DefaultConfigurationBuilder();
+ DefaultConfigurationBuilder configuration = new
DefaultConfigurationBuilder();
- configuration.addProperty("autodetect", auto);
- configuration.addProperty("autodetectIP", autoIP);
- for (int i = 0; i < names.size(); i++) {
- configuration.addProperty("domainnames.domainname",
names.get(i).toString());
- }
- return configuration;
+ configuration.addProperty("autodetect", auto);
+ configuration.addProperty("autodetectIP", autoIP);
+ for (int i = 0; i < names.size(); i++) {
+ configuration.addProperty("domainnames.domainname",
names.get(i).toString());
+ }
+ return configuration;
}
private DNSService setUpDNSServer(final String hostName) {
- DNSService dns = new MockDNSService() {
- public String getHostName(InetAddress inet) {
- return hostName;
- }
-
- public InetAddress[] getAllByName(String name) throws
UnknownHostException {
- return new InetAddress[] { InetAddress.getByName("127.0.0.1")
};
- }
-
- public InetAddress getLocalHost() throws UnknownHostException {
- return InetAddress.getLocalHost();
- }
- };
- return dns;
+ DNSService dns = new MockDNSService() {
+
+ @Override
+ public String getHostName(InetAddress inet) {
+ return hostName;
+ }
+
+ @Override
+ public InetAddress[] getAllByName(String name) throws
UnknownHostException {
+ return new InetAddress[]{InetAddress.getByName("127.0.0.1")};
+ }
+
+ @Override
+ public InetAddress getLocalHost() throws UnknownHostException {
+ return InetAddress.getLocalHost();
+ }
+ };
+ return dns;
}
// See https://issues.apache.org/jira/browse/JAMES-998
+ @Test
public void testNoConfiguredDomains() throws Exception {
- List<String> domains = new ArrayList<String>();
- XMLDomainList dom = new XMLDomainList();
- dom.setLog(LoggerFactory.getLogger("MockLog"));
- dom.configure(setUpConfiguration(false, false, domains));
- dom.setDNSService(setUpDNSServer("localhost"));
+ List<String> domains = new ArrayList<String>();
+ XMLDomainList dom = new XMLDomainList();
+ dom.setLog(LoggerFactory.getLogger("MockLog"));
+ dom.configure(setUpConfiguration(false, false, domains));
+ dom.setDNSService(setUpDNSServer("localhost"));
- assertNull("No domain found", dom.getDomains());
+ assertNull("No domain found", dom.getDomains());
}
+ @Test
public void testGetDomains() throws Exception {
- List<String> domains = new ArrayList<String>();
- domains.add("domain1.");
- domains.add("domain2.");
-
- XMLDomainList dom = new XMLDomainList();
- dom.setLog(LoggerFactory.getLogger("MockLog"));
- dom.configure(setUpConfiguration(false, false, domains));
- dom.setDNSService(setUpDNSServer("localhost"));
+ List<String> domains = new ArrayList<String>();
+ domains.add("domain1.");
+ domains.add("domain2.");
+
+ XMLDomainList dom = new XMLDomainList();
+ dom.setLog(LoggerFactory.getLogger("MockLog"));
+ dom.configure(setUpConfiguration(false, false, domains));
+ dom.setDNSService(setUpDNSServer("localhost"));
- assertTrue("Two domain found", dom.getDomains().length == 2);
+ assertTrue("Two domain found", dom.getDomains().length == 2);
}
+ @Test
public void testGetDomainsAutoDetectNotLocalHost() throws Exception {
- List<String> domains = new ArrayList<String>();
- domains.add("domain1.");
+ List<String> domains = new ArrayList<String>();
+ domains.add("domain1.");
- XMLDomainList dom = new XMLDomainList();
- dom.setLog(LoggerFactory.getLogger("MockLog"));
- dom.configure(setUpConfiguration(true, false, domains));
+ XMLDomainList dom = new XMLDomainList();
+ dom.setLog(LoggerFactory.getLogger("MockLog"));
+ dom.configure(setUpConfiguration(true, false, domains));
- dom.setDNSService(setUpDNSServer("local"));
- assertEquals("Two domains found", dom.getDomains().length, 2);
+ dom.setDNSService(setUpDNSServer("local"));
+ assertEquals("Two domains found", dom.getDomains().length, 2);
}
+ @Test
public void testGetDomainsAutoDetectLocalHost() throws Exception {
- List<String> domains = new ArrayList<String>();
- domains.add("domain1.");
+ List<String> domains = new ArrayList<String>();
+ domains.add("domain1.");
- XMLDomainList dom = new XMLDomainList();
- dom.setLog(LoggerFactory.getLogger("MockLog"));
- dom.configure(setUpConfiguration(true, false, domains));
+ XMLDomainList dom = new XMLDomainList();
+ dom.setLog(LoggerFactory.getLogger("MockLog"));
+ dom.configure(setUpConfiguration(true, false, domains));
- dom.setDNSService(setUpDNSServer("localhost"));
+ dom.setDNSService(setUpDNSServer("localhost"));
- assertEquals("One domain found", dom.getDomains().length, 1);
+ assertEquals("One domain found", dom.getDomains().length, 1);
}
}
Modified:
james/server/trunk/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java?rev=1299487&r1=1299486&r2=1299487&view=diff
==============================================================================
---
james/server/trunk/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
(original)
+++
james/server/trunk/data-file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java
Sun Mar 11 23:33:23 2012
@@ -33,6 +33,7 @@ public class FileMailRepositoryTest exte
* @throws ConfigurationException
* @throws Exception
*/
+ @Override
protected MailRepository getMailRepository() throws Exception {
MockFileSystem fs = new MockFileSystem();
FileMailRepository mr = new FileMailRepository();
Modified:
james/server/trunk/data-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java?rev=1299487&r1=1299486&r2=1299487&view=diff
==============================================================================
---
james/server/trunk/data-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
(original)
+++
james/server/trunk/data-file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
Sun Mar 11 23:33:23 2012
@@ -16,18 +16,17 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
package org.apache.james.mailrepository;
import java.io.File;
import java.util.Iterator;
-
-import junit.framework.TestCase;
-
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.filesystem.api.mock.MockFileSystem;
import org.apache.james.mailrepository.api.MailRepository;
import org.apache.james.mailrepository.file.MBoxMailRepository;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
import org.slf4j.LoggerFactory;
/**
@@ -37,39 +36,39 @@ import org.slf4j.LoggerFactory;
* NOTE this previously extended AbstractMailRepositoryTest to run all of the
* common mail repository tests on the MBox implementation.
*/
-public class MBoxMailRepositoryTest extends TestCase {
+public class MBoxMailRepositoryTest {
protected MailRepository getMailRepository() throws Exception {
- MBoxMailRepository mr = new MBoxMailRepository();
+ MBoxMailRepository mr = new MBoxMailRepository();
- DefaultConfigurationBuilder defaultConfiguration = new
DefaultConfigurationBuilder();
+ DefaultConfigurationBuilder defaultConfiguration = new
DefaultConfigurationBuilder();
- File fInbox = new
MockFileSystem().getFile("file://conf/org/apache/james/mailrepository/testdata/Inbox");
- String mboxPath = "mbox://" + fInbox.toURI().toString().substring(new
File("").toURI().toString().length());
+ File fInbox = new
MockFileSystem().getFile("file://conf/org/apache/james/mailrepository/testdata/Inbox");
+ String mboxPath = "mbox://" + fInbox.toURI().toString().substring(new
File("").toURI().toString().length());
- defaultConfiguration.addProperty("[@destinationURL]", mboxPath);
- defaultConfiguration.addProperty("[@type]", "MAIL");
- mr.setLog(LoggerFactory.getLogger("MockLog"));
- ;
- mr.configure(defaultConfiguration);
+ defaultConfiguration.addProperty("[@destinationURL]", mboxPath);
+ defaultConfiguration.addProperty("[@type]", "MAIL");
+ mr.setLog(LoggerFactory.getLogger("MockLog"));
+ mr.configure(defaultConfiguration);
- return mr;
+ return mr;
}
// Try to write a unit test for JAMES-744. At the moment it seems that we
// cannot reproduce it.
+ @Test
public void testReadMboxrdFile() throws Exception {
- MailRepository mr = getMailRepository();
+ MailRepository mr = getMailRepository();
- Iterator<String> keys = mr.list();
+ Iterator<String> keys = mr.list();
- assertTrue("Two messages in list", keys.hasNext());
- keys.next();
+ assertTrue("Two messages in list", keys.hasNext());
+ keys.next();
- assertTrue("One messages in list", keys.hasNext());
- keys.next();
+ assertTrue("One messages in list", keys.hasNext());
+ keys.next();
- assertFalse("No messages", keys.hasNext());
+ assertFalse("No messages", keys.hasNext());
}
/*
@@ -77,5 +76,4 @@ public class MBoxMailRepositoryTest exte
* System.err.println("TEST DISABLED!"); // Decomment this or remove this
* method to re-enable the MBoxRepository testing // super.runBare(); }
*/
-
}
Modified:
james/server/trunk/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java?rev=1299487&r1=1299486&r2=1299487&view=diff
==============================================================================
---
james/server/trunk/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
(original)
+++
james/server/trunk/data-file/src/test/java/org/apache/james/rrt/file/XMLRecipientRewriteTableTest.java
Sun Mar 11 23:33:23 2012
@@ -21,14 +21,13 @@ package org.apache.james.rrt.file;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.james.rrt.api.RecipientRewriteTable;
import org.apache.james.rrt.api.RecipientRewriteTableException;
-import org.apache.james.rrt.file.XMLRecipientRewriteTable;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
import org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest;
import org.apache.james.rrt.lib.RecipientRewriteTableUtil;
+import org.junit.Before;
import org.slf4j.LoggerFactory;
/**
@@ -38,16 +37,18 @@ public class XMLRecipientRewriteTableTes
private DefaultConfigurationBuilder defaultConfiguration = new
DefaultConfigurationBuilder();
+ @Before
@Override
- protected void setUp() throws Exception {
- defaultConfiguration.setDelimiterParsingDisabled(true);
- super.setUp();
+ public void setUp() throws Exception {
+ defaultConfiguration.setDelimiterParsingDisabled(true);
+ super.setUp();
}
+ @Override
protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws
Exception {
- XMLRecipientRewriteTable virtualUserTable = new
XMLRecipientRewriteTable();
- virtualUserTable.setLog(LoggerFactory.getLogger("MockLog"));
- return virtualUserTable;
+ XMLRecipientRewriteTable localVirtualUserTable = new
XMLRecipientRewriteTable();
+ localVirtualUserTable.setLog(LoggerFactory.getLogger("MockLog"));
+ return localVirtualUserTable;
}
/**
@@ -55,41 +56,44 @@ public class XMLRecipientRewriteTableTes
* @see
org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest#addMapping(java.lang.String,
* java.lang.String, java.lang.String, int)
*/
- protected boolean addMapping(String user, String domain, String mapping,
int type) throws RecipientRewriteTableException {
+ @Override
+ protected boolean addMapping(String user, String domain, String mapping,
int type) throws
+ RecipientRewriteTableException {
- Collection<String> mappings =
virtualUserTable.getUserDomainMappings(user, domain);
+ Collection<String> mappings =
virtualUserTable.getUserDomainMappings(user, domain);
- if (mappings == null) {
- mappings = new ArrayList<String>();
- } else {
- removeMappingsFromConfig(user, domain, mappings);
- }
-
- if (type == ERROR_TYPE) {
- mappings.add(RecipientRewriteTable.ERROR_PREFIX + mapping);
- } else if (type == REGEX_TYPE) {
- mappings.add(RecipientRewriteTable.REGEX_PREFIX + mapping);
- } else if (type == ADDRESS_TYPE) {
- mappings.add(mapping);
- } else if (type == ALIASDOMAIN_TYPE) {
- mappings.add(RecipientRewriteTable.ALIASDOMAIN_PREFIX + mapping);
- }
-
- if (mappings.size() > 0) {
- defaultConfiguration.addProperty("mapping", user + "@" + domain +
"=" + RecipientRewriteTableUtil.CollectionToMapping(mappings));
- }
-
- try {
- virtualUserTable.configure(defaultConfiguration);
- } catch (Exception e) {
- if (mappings.size() > 0) {
- return false;
- } else {
- return true;
- }
- }
+ if (mappings == null) {
+ mappings = new ArrayList<String>();
+ } else {
+ removeMappingsFromConfig(user, domain, mappings);
+ }
+
+ if (type == ERROR_TYPE) {
+ mappings.add(RecipientRewriteTable.ERROR_PREFIX + mapping);
+ } else if (type == REGEX_TYPE) {
+ mappings.add(RecipientRewriteTable.REGEX_PREFIX + mapping);
+ } else if (type == ADDRESS_TYPE) {
+ mappings.add(mapping);
+ } else if (type == ALIASDOMAIN_TYPE) {
+ mappings.add(RecipientRewriteTable.ALIASDOMAIN_PREFIX + mapping);
+ }
+
+ if (mappings.size() > 0) {
+ defaultConfiguration.addProperty("mapping", user + "@" + domain +
"=" + RecipientRewriteTableUtil.
+ CollectionToMapping(mappings));
+ }
+
+ try {
+ virtualUserTable.configure(defaultConfiguration);
+ } catch (Exception e) {
+ if (mappings.size() > 0) {
+ return false;
+ } else {
+ return true;
+ }
+ }
- return true;
+ return true;
}
@@ -98,62 +102,64 @@ public class XMLRecipientRewriteTableTes
* @see
org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest#removeMapping(java.lang.String,
* java.lang.String, java.lang.String, int)
*/
- protected boolean removeMapping(String user, String domain, String
mapping, int type) throws RecipientRewriteTableException {
+ @Override
+ protected boolean removeMapping(String user, String domain, String
mapping, int type) throws
+ RecipientRewriteTableException {
- Collection<String> mappings =
virtualUserTable.getUserDomainMappings(user, domain);
+ Collection<String> mappings =
virtualUserTable.getUserDomainMappings(user, domain);
- if (mappings == null) {
- return false;
- }
-
- removeMappingsFromConfig(user, domain, mappings);
-
- if (type == ERROR_TYPE) {
- mappings.remove(RecipientRewriteTable.ERROR_PREFIX + mapping);
- } else if (type == REGEX_TYPE) {
- mappings.remove(RecipientRewriteTable.REGEX_PREFIX + mapping);
- } else if (type == ADDRESS_TYPE) {
- mappings.remove(mapping);
- } else if (type == ALIASDOMAIN_TYPE) {
- mappings.remove(RecipientRewriteTable.ALIASDOMAIN_PREFIX +
mapping);
- }
-
- if (mappings.size() > 0) {
- defaultConfiguration.addProperty("mapping", user + "@" + domain +
"=" + RecipientRewriteTableUtil.CollectionToMapping(mappings));
- }
-
- try {
- virtualUserTable.configure(defaultConfiguration);
- } catch (Exception e) {
- if (mappings.size() > 0) {
- return false;
- } else {
- return true;
- }
- }
+ if (mappings == null) {
+ return false;
+ }
+
+ removeMappingsFromConfig(user, domain, mappings);
+
+ if (type == ERROR_TYPE) {
+ mappings.remove(RecipientRewriteTable.ERROR_PREFIX + mapping);
+ } else if (type == REGEX_TYPE) {
+ mappings.remove(RecipientRewriteTable.REGEX_PREFIX + mapping);
+ } else if (type == ADDRESS_TYPE) {
+ mappings.remove(mapping);
+ } else if (type == ALIASDOMAIN_TYPE) {
+ mappings.remove(RecipientRewriteTable.ALIASDOMAIN_PREFIX + mapping);
+ }
+
+ if (mappings.size() > 0) {
+ defaultConfiguration.addProperty("mapping", user + "@" + domain +
"=" + RecipientRewriteTableUtil.
+ CollectionToMapping(mappings));
+ }
+
+ try {
+ virtualUserTable.configure(defaultConfiguration);
+ } catch (Exception e) {
+ if (mappings.size() > 0) {
+ return false;
+ } else {
+ return true;
+ }
+ }
- return true;
+ return true;
}
@SuppressWarnings("unchecked")
private void removeMappingsFromConfig(String user, String domain,
Collection<String> mappings) {
- List<String> confs = defaultConfiguration.getList("mapping");
- List<String> stored = new ArrayList<String>();
- for (int i = 0; i < confs.size(); i++) {
- String c = confs.get(i);
- String mapping = user + "@" + domain + "=" +
RecipientRewriteTableUtil.CollectionToMapping(mappings);
-
- if (!c.equalsIgnoreCase(mapping)) {
- stored.add(c);
- }
- }
- // clear old values
- defaultConfiguration.clear();
- // add stored mappings
- for (int i = 0; i < stored.size(); i++) {
- defaultConfiguration.addProperty("mapping", stored.get(i));
- }
+ List<String> confs = defaultConfiguration.getList("mapping");
+ List<String> stored = new ArrayList<String>();
+ for (int i = 0; i < confs.size(); i++) {
+ String c = confs.get(i);
+ String mapping = user + "@" + domain + "=" +
RecipientRewriteTableUtil.CollectionToMapping(mappings);
+
+ if (!c.equalsIgnoreCase(mapping)) {
+ stored.add(c);
+ }
+ }
+ // clear old values
+ defaultConfiguration.clear();
+ // add stored mappings
+ for (int i = 0; i < stored.size(); i++) {
+ defaultConfiguration.addProperty("mapping", stored.get(i));
+ }
}
-
}
Modified:
james/server/trunk/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java?rev=1299487&r1=1299486&r2=1299487&view=diff
==============================================================================
---
james/server/trunk/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
(original)
+++
james/server/trunk/data-file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java
Sun Mar 11 23:33:23 2012
@@ -33,6 +33,7 @@ import org.apache.james.lifecycle.api.Li
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.lib.AbstractUsersRepositoryTest;
+import org.junit.Before;
import org.slf4j.LoggerFactory;
/**
@@ -45,7 +46,9 @@ public class UsersFileRepositoryTest ext
/**
* @see junit.framework.TestCase#setUp()
*/
- protected void setUp() throws Exception {
+ @Before
+ @Override
+ public void setUp() throws Exception {
super.setUp();
File targetRepositoryFolder = new File(TARGET_REPOSITORY_FOLDER);
if (targetRepositoryFolder.exists()) {
@@ -60,17 +63,21 @@ public class UsersFileRepositoryTest ext
* @return the user repository
* @throws Exception
*/
+ @Override
protected UsersRepository getUsersRepository() throws Exception {
FileSystem fs = new FileSystem() {
+ @Override
public File getBasedir() throws FileNotFoundException {
return new File(".");
}
+ @Override
public InputStream getResource(String url) throws IOException {
return new FileInputStream(getFile(url));
}
+ @Override
public File getFile(String fileURL) throws FileNotFoundException {
return new
File(fileURL.substring(FileSystem.FILE_PROTOCOL.length()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
