You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2007/03/11 12:39:22 UTC
svn commit: r516891 - in /portals/jetspeed-2/trunk/components/rewriter:
src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java
src/test/org/apache/jetspeed/rewriter/TestRewriterController.java
test/rewriter/test-002-output.html
Author: ate
Date: Sun Mar 11 04:39:21 2007
New Revision: 516891
URL: http://svn.apache.org/viewvc?view=rev&rev=516891
Log:
JIRA issue JS2-659: Compliance with http://www.apache.org/legal/src-headers.html
rewriter testcases wrote output to the test folder :(
Cleanup of the testcase so output now goes to the target folder only (and so no need to add license headers to even those silly files)
Removed:
portals/jetspeed-2/trunk/components/rewriter/test/rewriter/test-002-output.html
Modified:
portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java
portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestRewriterController.java
Modified: portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java?view=diff&rev=516891&r1=516890&r2=516891
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java (original)
+++ portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java Sun Mar 11 04:39:21 2007
@@ -17,6 +17,7 @@
package org.apache.jetspeed.rewriter;
import java.io.BufferedInputStream;
+import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
@@ -216,7 +217,8 @@
*/
private FileWriter getTestWriter(String filename) throws IOException
{
- return new FileWriter("test/rewriter/" + filename);
+ new File("target/test/rewriter").mkdirs();
+ return new FileWriter("target/test/rewriter/" + filename);
}
Modified: portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestRewriterController.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestRewriterController.java?view=diff&rev=516891&r1=516890&r2=516891
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestRewriterController.java (original)
+++ portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestRewriterController.java Sun Mar 11 04:39:21 2007
@@ -16,6 +16,7 @@
*/
package org.apache.jetspeed.rewriter;
+import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
@@ -90,7 +91,7 @@
Rewriter basic = component.createRewriter();
assertNotNull("basic rewriter is null", basic);
- FileReader reader = getTestReader("test-rewriter-rules.xml");
+ FileReader reader = new FileReader("test/rewriter/test-rewriter-rules.xml");
Ruleset ruleset = component.loadRuleset(reader);
assertNotNull("ruleset is null", ruleset);
RulesetRewriter rewriter = component.createRewriter(ruleset);
@@ -104,7 +105,7 @@
assertNotNull("template component is null", component);
assertNotNull("rewriter component is null", component);
- FileReader reader = getTestReader("test-rewriter-rules.xml");
+ FileReader reader = new FileReader("test/rewriter/test-rewriter-rules.xml");
Ruleset ruleset = component.loadRuleset(reader);
assertNotNull("ruleset is null", ruleset);
assertEquals("ruleset id", "test-set-101", ruleset.getId());
@@ -205,7 +206,7 @@
assertNotNull("rewriter component is null", component);
- FileReader reader = getTestReader("test-remove-rules.xml");
+ FileReader reader = new FileReader("test/rewriter/test-remove-rules.xml");
Ruleset ruleset = component.loadRuleset(reader);
reader.close();
@@ -214,7 +215,7 @@
assertNotNull("ruleset rewriter is null", rewriter);
assertNotNull("ruleset is null", rewriter.getRuleset());
- FileReader htmlReader = getTestReader("test-001.html");
+ FileReader htmlReader = new FileReader("test/rewriter/test-001.html");
FileWriter htmlWriter = getTestWriter("test-001-output.html");
ParserAdaptor adaptor = component.createParserAdaptor("text/html");
@@ -224,7 +225,7 @@
htmlReader.close();
// validate result
- FileReader testReader = getTestReader("test-001-output.html");
+ FileReader testReader = new FileReader("target/test/rewriter/test-001-output.html");
UnitTestRewriter testRewriter = new UnitTestRewriter();
testRewriter.parse(component.createParserAdaptor("text/html"), testReader);
assertTrue("1st rewritten anchor: " + testRewriter.getAnchorValue("1"), testRewriter.getAnchorValue("1")
@@ -245,17 +246,6 @@
}
/**
- * Gets a reader for a given filename in the test directory.
- *
- * @return A file reader to the test rules file
- * @throws IOException
- */
- private FileReader getTestReader(String filename) throws IOException
- {
- return new FileReader("test/rewriter/" + filename);
- }
-
- /**
* Gets a writer for a given filename in the test directory.
*
* @return A file reader to the test rules file
@@ -263,9 +253,8 @@
*/
private FileWriter getTestWriter(String filename) throws IOException
{
- String cwd = System.getProperty("user.dir");
- String path;
- return new FileWriter("test/rewriter/" + filename);
+ new File("target/test/rewriter").mkdirs();
+ return new FileWriter("target/test/rewriter/" + filename);
}
@@ -290,7 +279,7 @@
assertNotNull("rewriter component is null", component);
- Reader reader = getTestReader("default-rewriter-rules.xml");
+ Reader reader = new FileReader("test/rewriter/default-rewriter-rules.xml");
Ruleset ruleset = component.loadRuleset(reader);
reader.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org