This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-jspf.git
commit 862496eccde0b8e3a095ef05fd37a63f17416c19
Author: Emerson Pinter <e...@pinter.dev>
AuthorDate: Thu Jan 23 13:31:34 2025 -0300
Cleanup tests
---
.../AsynchronousSPFExecutorIntegrationTest.java | 26 +++-----
.../apache/james/jspf/DNSServiceXBillImplTest.java | 73 ++++++++++------------
.../apache/james/jspf/DefaultSPFResolverTest.java | 41 ++++++++++--
.../SynchronousSPFExecutorIntegrationTest.java | 27 +++-----
4 files changed, 91 insertions(+), 76 deletions(-)
diff --git
a/resolver/src/test/java/org/apache/james/jspf/AsynchronousSPFExecutorIntegrationTest.java
b/resolver/src/test/java/org/apache/james/jspf/AsynchronousSPFExecutorIntegrationTest.java
index 64713b2..3d0dfd9 100644
---
a/resolver/src/test/java/org/apache/james/jspf/AsynchronousSPFExecutorIntegrationTest.java
+++
b/resolver/src/test/java/org/apache/james/jspf/AsynchronousSPFExecutorIntegrationTest.java
@@ -40,7 +40,7 @@ import java.util.concurrent.ThreadLocalRandom;
public class AsynchronousSPFExecutorIntegrationTest {
@BeforeClass
public static void setup() {
- System.out.println("Setting default resolver");
+ // set default resolver before the tests to avoid errors caused by
previous tests
try {
Lookup.setDefaultResolver(new SimpleResolver());
} catch (UnknownHostException e) {
@@ -57,9 +57,6 @@ public class AsynchronousSPFExecutorIntegrationTest {
public void test() {
SPF spf = DefaultSPF.createAsync();
SPFResult result = spf.checkSPF("109.197.176.25", "n...@linagora.com",
"linagora.com");
- System.out.println(result.getResult());
- System.out.println(result.getExplanation());
- System.out.println(result.getHeader());
assertEquals("pass", result.getResult());
assertEquals("Received-SPF: pass (spfCheck: domain of linagora.com
designates 109.197.176.25 as permitted sender) client-ip=109.197.176.25;
envelope-from=n...@linagora.com; helo=linagora.com;",
result.getHeader());
@@ -68,37 +65,34 @@ public class AsynchronousSPFExecutorIntegrationTest {
@Test
public void shouldHandleDomainNotFound() {
SPF spf = DefaultSPF.createAsync();
- SPFResult result =
spf.checkSPF("207.54.72.202","do_not_re...@reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de","reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de");
- System.out.println(result.getResult());
- System.out.println(result.getExplanation());
- System.out.println(result.getHeader());
+ SPFResult result = spf.checkSPF("207.54.72.202",
+
"do_not_re...@reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de",
+ "reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de");
assertEquals("none", result.getResult());
+ assertEquals("Received-SPF: none (spfCheck: 207.54.72.202 is neither
permitted nor denied by domain of
reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de) client-ip=207.54.72.202;
envelope-from=do_not_re...@reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de;
helo=reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de;",
+ result.getHeader());
}
@Test
public void shouldHandleSPFNotFound() {
SPF spf = DefaultSPF.createAsync();
SPFResult result =
spf.checkSPF("207.54.72.202","do_not_re...@com.br","com.br");
- System.out.println(result.getResult());
- System.out.println(result.getExplanation());
- System.out.println(result.getHeader());
assertEquals("none", result.getResult());
+ assertEquals("Received-SPF: none (spfCheck: 207.54.72.202 is neither
permitted nor denied by domain of com.br) client-ip=207.54.72.202;
envelope-from=do_not_re...@com.br; helo=com.br;",
+ result.getHeader());
}
@Test
public void shouldReturnTempErrorOnPortUnreachable() throws
UnknownHostException {
Resolver simpleResolver = new SimpleResolver("127.0.0.1");
simpleResolver.setPort(ThreadLocalRandom.current().nextInt(55000,
56000));
-
DNSServiceXBillImpl dns = new DNSServiceXBillImpl(simpleResolver);
-
SPF spf = new SPF(dns, new AsynchronousSPFExecutor(dns));
SPFResult result = spf.checkSPF("207.54.72.202",
"do_not_re...@reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de",
"reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de");
- System.out.println(result.getResult());
- System.out.println(result.getExplanation());
- System.out.println(result.getHeader());
assertEquals("temperror", result.getResult());
+ assertEquals("Received-SPF: temperror (spfCheck: Error in retrieving
data from DNS) client-ip=207.54.72.202;
envelope-from=do_not_re...@reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de;
helo=reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de;",
+ result.getHeader());
}
}
diff --git
a/resolver/src/test/java/org/apache/james/jspf/DNSServiceXBillImplTest.java
b/resolver/src/test/java/org/apache/james/jspf/DNSServiceXBillImplTest.java
index 070bf9b..e51969a 100644
--- a/resolver/src/test/java/org/apache/james/jspf/DNSServiceXBillImplTest.java
+++ b/resolver/src/test/java/org/apache/james/jspf/DNSServiceXBillImplTest.java
@@ -21,61 +21,56 @@
package org.apache.james.jspf;
import org.apache.james.jspf.impl.DNSServiceXBillImpl;
+import org.junit.Test;
import org.xbill.DNS.DClass;
-import org.xbill.DNS.Lookup;
import org.xbill.DNS.Name;
import org.xbill.DNS.Record;
import org.xbill.DNS.SPFRecord;
import org.xbill.DNS.TXTRecord;
-import org.xbill.DNS.TextParseException;
import org.xbill.DNS.Type;
-import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.util.List;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
-public class DNSServiceXBillImplTest extends TestCase {
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
+public class DNSServiceXBillImplTest {
+ @Test
+ public void testGetLocalDomainNames() throws UnknownHostException {
+ assertFalse(new DNSServiceXBillImpl().getLocalDomainNames().isEmpty());
}
- /*
- * Test method for
- * 'org.apache.james.jspf.DNSServiceXBillImpl.getLocalDomainNames()'
- */
- public void testGetLocalDomainNames() throws UnknownHostException,
- TextParseException {
- // This write MACHINE-NAME/MACHINE-ADDRESS
- System.out.println(InetAddress.getLocalHost());
- // THIS WRITE localhost/127.0.0.1
- System.out.println(InetAddress.getAllByName(null)[0]);
- // THIS WRITE a fully qualified MACHINE-NAME.MACHINE-DOMAIN
- System.out.println(InetAddress.getLocalHost().getCanonicalHostName());
- // THIS WRITE localhost
- System.out.println(InetAddress.getAllByName(null)[0]
- .getCanonicalHostName());
- Record[] record = new Lookup(Name.root, Type.ANY).run();
- if (record !=null) System.out.println(record[0]);
- }
-
+ @Test
public void testMultipleStrings() throws Exception {
- Record[] rr = new Record[] {
TXTRecord.fromString(Name.fromString("test.local."), Type.TXT, DClass.IN, 0,
"\"string \" \"concatenated\"", Name.fromString("local.")) };
- assertEquals("string concatenated",
DNSServiceXBillImpl.convertRecordsToList(rr).get(0));
+ Record[] rr = new Record[]{
+ TXTRecord.fromString(Name.fromString("test.local."),
+ Type.TXT, DClass.IN, 0, "\"string \"
\"concatenated\"", Name.fromString("local."))};
+ List<String> records = DNSServiceXBillImpl.convertRecordsToList(rr);
+ assertNotNull(records);
+ assertEquals("string concatenated", records.get(0));
- rr = new Record[] {
TXTRecord.fromString(Name.fromString("test.local."), Type.TXT, DClass.IN, 0,
"string", Name.fromString("local.")) };
- assertEquals("string",
DNSServiceXBillImpl.convertRecordsToList(rr).get(0));
+ rr = new Record[]{
+ TXTRecord.fromString(Name.fromString("test.local."),
+ Type.TXT, DClass.IN, 0, "string",
Name.fromString("local."))};
+ records = DNSServiceXBillImpl.convertRecordsToList(rr);
+ assertNotNull(records);
+ assertEquals("string", records.get(0));
- rr = new Record[] {
TXTRecord.fromString(Name.fromString("test.local."), Type.TXT, DClass.IN, 0,
"\"quoted string\"", Name.fromString("local.")) };
- assertEquals("quoted string",
DNSServiceXBillImpl.convertRecordsToList(rr).get(0));
+ rr = new Record[]{
+ TXTRecord.fromString(Name.fromString("test.local."),
+ Type.TXT, DClass.IN, 0, "\"quoted string\"",
Name.fromString("local."))};
+ records = DNSServiceXBillImpl.convertRecordsToList(rr);
+ assertNotNull(records);
+ assertEquals("quoted string", records.get(0));
- rr = new Record[] {
SPFRecord.fromString(Name.fromString("test.local."), Type.SPF, DClass.IN, 0,
"\"quot\" \"ed st\" \"ring\"", Name.fromString("local.")) };
- assertEquals("quoted string",
DNSServiceXBillImpl.convertRecordsToList(rr).get(0));
+ rr = new Record[]{
+ SPFRecord.fromString(Name.fromString("test.local."),
+ Type.SPF, DClass.IN, 0, "\"quot\" \"ed st\" \"ring\"",
Name.fromString("local."))};
+ records = DNSServiceXBillImpl.convertRecordsToList(rr);
+ assertNotNull(records);
+ assertEquals("quoted string", records.get(0));
}
}
diff --git
a/resolver/src/test/java/org/apache/james/jspf/DefaultSPFResolverTest.java
b/resolver/src/test/java/org/apache/james/jspf/DefaultSPFResolverTest.java
index a84046d..dee036c 100644
--- a/resolver/src/test/java/org/apache/james/jspf/DefaultSPFResolverTest.java
+++ b/resolver/src/test/java/org/apache/james/jspf/DefaultSPFResolverTest.java
@@ -19,19 +19,52 @@
package org.apache.james.jspf;
+import org.apache.james.jspf.executor.SPFResult;
import org.apache.james.jspf.impl.DefaultSPF;
import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
+import org.xbill.DNS.DClass;
+import org.xbill.DNS.Lookup;
+import org.xbill.DNS.SimpleResolver;
+
+import java.net.UnknownHostException;
+
+import static org.junit.Assert.assertEquals;
public class DefaultSPFResolverTest {
+ @BeforeClass
+ public static void setup() {
+ // set default resolver before the tests to avoid errors caused by
previous tests
+ try {
+ Lookup.setDefaultResolver(new SimpleResolver());
+ } catch (UnknownHostException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Before
+ public void clearDnsCache() {
+ Lookup.getDefaultCache(DClass.IN).clearCache();
+ }
+
@Test
public void shouldHandleDomainNotFound() {
- String spfResult = new
DefaultSPF().checkSPF("207.54.72.202","do_not_re...@reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de","reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de").getResult();
- Assert.assertEquals("none", spfResult);
+ SPFResult spfResult = new DefaultSPF().checkSPF("207.54.72.202",
+
"do_not_re...@reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de",
+ "reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de");
+ assertEquals("none", spfResult.getResult());
+ assertEquals("Received-SPF: none (spfCheck: 207.54.72.202 is neither
permitted nor denied by domain of
reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de) client-ip=207.54.72.202;
envelope-from=do_not_re...@reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de;
helo=reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de;",
+ spfResult.getHeader());
}
+
@Test
public void shouldHandleSPFNotFound() {
- String spfResult = new
DefaultSPF().checkSPF("207.54.72.202","do_not_re...@com.br","com.br").getResult();
- Assert.assertEquals("none", spfResult);
+ SPFResult spfResult = new DefaultSPF().checkSPF("207.54.72.202",
+ "do_not_re...@com.br", "com.br");
+ assertEquals("none", spfResult.getResult());
+ assertEquals("Received-SPF: none (spfCheck: 207.54.72.202 is neither
permitted nor denied by domain of com.br) client-ip=207.54.72.202;
envelope-from=do_not_re...@com.br; helo=com.br;",
+ spfResult.getHeader());
}
}
diff --git
a/resolver/src/test/java/org/apache/james/jspf/SynchronousSPFExecutorIntegrationTest.java
b/resolver/src/test/java/org/apache/james/jspf/SynchronousSPFExecutorIntegrationTest.java
index 1ba354f..afc3190 100644
---
a/resolver/src/test/java/org/apache/james/jspf/SynchronousSPFExecutorIntegrationTest.java
+++
b/resolver/src/test/java/org/apache/james/jspf/SynchronousSPFExecutorIntegrationTest.java
@@ -19,7 +19,6 @@
package org.apache.james.jspf;
-import org.apache.james.jspf.executor.AsynchronousSPFExecutor;
import org.apache.james.jspf.executor.SPFResult;
import org.apache.james.jspf.executor.SynchronousSPFExecutor;
import org.apache.james.jspf.impl.DNSServiceXBillImpl;
@@ -41,7 +40,7 @@ import static org.junit.Assert.assertEquals;
public class SynchronousSPFExecutorIntegrationTest {
@BeforeClass
public static void setup() {
- System.out.println("Setting default resolver");
+ // set default resolver before the tests to avoid errors caused by
previous tests
try {
Lookup.setDefaultResolver(new SimpleResolver());
} catch (UnknownHostException e) {
@@ -58,9 +57,6 @@ public class SynchronousSPFExecutorIntegrationTest {
public void test() {
SPF spf = DefaultSPF.createSync();
SPFResult result = spf.checkSPF("109.197.176.25", "n...@linagora.com",
"linagora.com");
- System.out.println(result.getResult());
- System.out.println(result.getExplanation());
- System.out.println(result.getHeader());
assertEquals("pass", result.getResult());
assertEquals("Received-SPF: pass (spfCheck: domain of linagora.com
designates 109.197.176.25 as permitted sender) client-ip=109.197.176.25;
envelope-from=n...@linagora.com; helo=linagora.com;",
result.getHeader());
@@ -69,37 +65,34 @@ public class SynchronousSPFExecutorIntegrationTest {
@Test
public void shouldHandleDomainNotFound() {
SPF spf = DefaultSPF.createSync();
- SPFResult result =
spf.checkSPF("207.54.72.202","do_not_re...@reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de","reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de");
- System.out.println(result.getResult());
- System.out.println(result.getExplanation());
- System.out.println(result.getHeader());
+ SPFResult result = spf.checkSPF("207.54.72.202",
+
"do_not_re...@reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de",
+ "reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de");
assertEquals("none", result.getResult());
+ assertEquals("Received-SPF: none (spfCheck: 207.54.72.202 is neither
permitted nor denied by domain of
reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de) client-ip=207.54.72.202;
envelope-from=do_not_re...@reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de;
helo=reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de;",
+ result.getHeader());
}
@Test
public void shouldHandleSPFNotFound() {
SPF spf = DefaultSPF.createSync();
SPFResult result =
spf.checkSPF("207.54.72.202","do_not_re...@com.br","com.br");
- System.out.println(result.getResult());
- System.out.println(result.getExplanation());
- System.out.println(result.getHeader());
assertEquals("none", result.getResult());
+ assertEquals("Received-SPF: none (spfCheck: 207.54.72.202 is neither
permitted nor denied by domain of com.br) client-ip=207.54.72.202;
envelope-from=do_not_re...@com.br; helo=com.br;",
+ result.getHeader());
}
@Test
public void shouldReturnTempErrorOnPortUnreachable() throws
UnknownHostException {
Resolver simpleResolver = new SimpleResolver("127.0.0.1");
simpleResolver.setPort(ThreadLocalRandom.current().nextInt(55000,
56000));
-
DNSServiceXBillImpl dns = new DNSServiceXBillImpl(simpleResolver);
-
SPF spf = new SPF(dns, new SynchronousSPFExecutor(dns));
SPFResult result = spf.checkSPF("207.54.72.202",
"do_not_re...@reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de",
"reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de");
- System.out.println(result.getResult());
- System.out.println(result.getExplanation());
- System.out.println(result.getHeader());
assertEquals("temperror", result.getResult());
+ assertEquals("Received-SPF: temperror (spfCheck: Error in retrieving
data from DNS) client-ip=207.54.72.202;
envelope-from=do_not_re...@reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de;
helo=reyifglerifwukfvbdjhrkbvebvekvfulervkerkeruerbeb.de;"
+ , result.getHeader());
}
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
