Author: bago
Date: Mon Feb 25 02:29:53 2008
New Revision: 630793
URL: http://svn.apache.org/viewvc?rev=630793&view=rev
Log:
We don't need this file not found lazy "check" anymore. We can bundle the
testsuite file now.
Modified:
james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
james/jspf/trunk/src/test/java/org/apache/james/jspf/RFC4408AsynchronousYamlTest.java
Modified:
james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java?rev=630793&r1=630792&r2=630793&view=diff
==============================================================================
--- james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
(original)
+++ james/jspf/trunk/src/test/java/org/apache/james/jspf/AbstractYamlTest.java
Mon Feb 25 02:29:53 2008
@@ -57,6 +57,7 @@
import org.xbill.DNS.TextParseException;
import java.io.BufferedReader;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -164,7 +165,7 @@
return tests;
} else {
- throw new RuntimeException("Unable to load the file");
+ throw new FileNotFoundException("Unable to load the file");
}
}
Modified:
james/jspf/trunk/src/test/java/org/apache/james/jspf/RFC4408AsynchronousYamlTest.java
URL:
http://svn.apache.org/viewvc/james/jspf/trunk/src/test/java/org/apache/james/jspf/RFC4408AsynchronousYamlTest.java?rev=630793&r1=630792&r2=630793&view=diff
==============================================================================
---
james/jspf/trunk/src/test/java/org/apache/james/jspf/RFC4408AsynchronousYamlTest.java
(original)
+++
james/jspf/trunk/src/test/java/org/apache/james/jspf/RFC4408AsynchronousYamlTest.java
Mon Feb 25 02:29:53 2008
@@ -73,21 +73,11 @@
public RFC4408AsynchronousSuite() throws IOException {
super();
- try {
- List tests = loadTests(YAMLFILE2);
- Iterator i = tests.iterator();
- while (i.hasNext()) {
- SPFYamlTestSuite o = (SPFYamlTestSuite) i.next();
- addTest(new RFC4408AsynchronousYamlTest(o));
- }
- } catch (RuntimeException e) {
- if ("Unable to load the file".equals(e.getMessage())) {
- System.err.println("WARNING: RFC4408 tests disabled.");
- System.err.println("The RFC4408 test-suite is not bundled
with jspf due to licensing issues.");
- System.err.println("You can download the yaml testsuite at
the following url:");
- System.err.println("
http://www.openspf.org/source/project/test-suite/";);
- System.err.println("and place an rfc4408-tests.yml file in
the /src/test/resources/org/apache/james/jspf folder.");
- }
+ List tests = loadTests(YAMLFILE2);
+ Iterator i = tests.iterator();
+ while (i.hasNext()) {
+ SPFYamlTestSuite o = (SPFYamlTestSuite) i.next();
+ addTest(new RFC4408AsynchronousYamlTest(o));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
