Author: berndf
Date: Tue May 9 14:52:09 2006
New Revision: 405546
URL: http://svn.apache.org/viewcvs?rev=405546&view=rev
Log:
extract zone resource file loading in own method; change zone file naming to
simplify loading
Added:
james/server/trunk/src/test/org/apache/james/dnsserver/brandilyncollins.com.zone
(contents, props changed)
- copied, changed from r405366,
james/server/trunk/src/test/org/apache/james/dnsserver/brandilyncollins-com.zone
james/server/trunk/src/test/org/apache/james/dnsserver/pippo.com.zone
(contents, props changed)
- copied, changed from r405366,
james/server/trunk/src/test/org/apache/james/dnsserver/pippo-com.zone
james/server/trunk/src/test/org/apache/james/dnsserver/test-zone.com.zone
(contents, props changed)
- copied, changed from r405366,
james/server/trunk/src/test/org/apache/james/dnsserver/test-zone-com.zone
Removed:
james/server/trunk/src/test/org/apache/james/dnsserver/brandilyncollins-com.zone
james/server/trunk/src/test/org/apache/james/dnsserver/pippo-com.zone
james/server/trunk/src/test/org/apache/james/dnsserver/test-zone-com.zone
Modified:
james/server/trunk/src/test/org/apache/james/dnsserver/DNSServerTest.java
Modified:
james/server/trunk/src/test/org/apache/james/dnsserver/DNSServerTest.java
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/dnsserver/DNSServerTest.java?rev=405546&r1=405545&r2=405546&view=diff
==============================================================================
--- james/server/trunk/src/test/org/apache/james/dnsserver/DNSServerTest.java
(original)
+++ james/server/trunk/src/test/org/apache/james/dnsserver/DNSServerTest.java
Tue May 9 14:52:09 2006
@@ -28,8 +28,10 @@
import org.xbill.DNS.Zone;
import java.io.ByteArrayInputStream;
+import java.io.IOException;
import java.util.Collection;
import java.util.Iterator;
+import java.net.URL;
import junit.framework.TestCase;
@@ -48,7 +50,7 @@
* @throws Exception
*/
public void testINARecords() throws Exception {
- Zone z = new
Zone(Name.fromString("pippo.com."),getClass().getResource("pippo-com.zone").getFile());
+ Zone z = loadZone("pippo.com.");
dnsServer.setResolver(null);
dnsServer.setLookupper(new ZoneLookupper(z));
Collection records = dnsServer.findMXRecords("www.pippo.com.");
@@ -61,7 +63,7 @@
* @throws Exception
*/
public void testMXCatches() throws Exception {
- Zone z = new
Zone(Name.fromString("test-zone.com."),getClass().getResource("test-zone-com.zone").getFile());
+ Zone z = loadZone("test-zone.com.");
dnsServer.setResolver(null);
dnsServer.setLookupper(new ZoneLookupper(z));
Collection res = dnsServer.findMXRecords("test-zone.com.");
@@ -73,7 +75,7 @@
assertEquals(1,res.size());
assertEquals("mail.test-zone.com.",res.iterator().next());
}
-
+
/**
* Please note that this is an hardcoded test that works because
* brandilyncollins.com. has an MX record that point to mxmail.register.com
@@ -84,7 +86,7 @@
* @throws Exception
*/
public void testCNAMEasMXrecords() throws Exception {
- Zone z = new
Zone(Name.fromString("brandilyncollins.com."),getClass().getResource("brandilyncollins-com.zone").getFile());
+ Zone z = loadZone("brandilyncollins.com.");
dnsServer.setResolver(null);
dnsServer.setLookupper(new ZoneLookupper(z));
Iterator records =
dnsServer.getSMTPHostAddresses("brandilyncollins.com.");
@@ -106,6 +108,15 @@
protected void tearDown() throws Exception {
dnsServer.setLookupper(null);
ContainerUtil.dispose(dnsServer);
+ }
+
+ private Zone loadZone(String zoneName) throws IOException {
+ String zoneFilename = zoneName + "zone";
+ URL zoneResource = getClass().getResource(zoneFilename);
+ assertNotNull("test resource for zone could not be loaded: " +
zoneFilename, zoneResource);
+ String zoneFile = zoneResource.getFile();
+ Zone zone = new Zone(Name.fromString(zoneName),zoneFile);
+ return zone;
}
private class ZoneLookupper implements Lookupper {
Copied:
james/server/trunk/src/test/org/apache/james/dnsserver/brandilyncollins.com.zone
(from r405366,
james/server/trunk/src/test/org/apache/james/dnsserver/brandilyncollins-com.zone)
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/dnsserver/brandilyncollins.com.zone?p2=james/server/trunk/src/test/org/apache/james/dnsserver/brandilyncollins.com.zone&p1=james/server/trunk/src/test/org/apache/james/dnsserver/brandilyncollins-com.zone&r1=405366&r2=405546&rev=405546&view=diff
==============================================================================
(empty)
Propchange:
james/server/trunk/src/test/org/apache/james/dnsserver/brandilyncollins.com.zone
------------------------------------------------------------------------------
svn:eol-style = native
Copied: james/server/trunk/src/test/org/apache/james/dnsserver/pippo.com.zone
(from r405366,
james/server/trunk/src/test/org/apache/james/dnsserver/pippo-com.zone)
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/dnsserver/pippo.com.zone?p2=james/server/trunk/src/test/org/apache/james/dnsserver/pippo.com.zone&p1=james/server/trunk/src/test/org/apache/james/dnsserver/pippo-com.zone&r1=405366&r2=405546&rev=405546&view=diff
==============================================================================
(empty)
Propchange:
james/server/trunk/src/test/org/apache/james/dnsserver/pippo.com.zone
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
james/server/trunk/src/test/org/apache/james/dnsserver/test-zone.com.zone (from
r405366,
james/server/trunk/src/test/org/apache/james/dnsserver/test-zone-com.zone)
URL:
http://svn.apache.org/viewcvs/james/server/trunk/src/test/org/apache/james/dnsserver/test-zone.com.zone?p2=james/server/trunk/src/test/org/apache/james/dnsserver/test-zone.com.zone&p1=james/server/trunk/src/test/org/apache/james/dnsserver/test-zone-com.zone&r1=405366&r2=405546&rev=405546&view=diff
==============================================================================
(empty)
Propchange:
james/server/trunk/src/test/org/apache/james/dnsserver/test-zone.com.zone
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
