You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2017/06/14 17:30:30 UTC
svn commit: r1798729 - in /commons/proper/jelly/trunk/src:
main/java/org/apache/commons/jelly/parser/
test/java/org/apache/commons/jelly/ test/java/org/apache/commons/jelly/core/
test/java/org/apache/commons/jelly/test/xml/
Author: oheger
Date: Wed Jun 14 17:30:30 2017
New Revision: 1798729
URL: http://svn.apache.org/viewvc?rev=1798729&view=rev
Log:
Fixed some test cases that were broken when moving source files.
Modified:
commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TestCoreTags.java
commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java
commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java
Modified: commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/parser/XMLParser.java
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/parser/XMLParser.java?rev=1798729&r1=1798728&r2=1798729&view=diff
==============================================================================
--- commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/parser/XMLParser.java (original)
+++ commons/proper/jelly/trunk/src/main/java/org/apache/commons/jelly/parser/XMLParser.java Wed Jun 14 17:30:30 2017
@@ -995,7 +995,7 @@ public class XMLParser extends DefaultHa
InputStream in = null;
URL url =
- getClassLoader().getResource("src/main/resources/org/apache/commons/jelly/jelly.properties");
+ getClassLoader().getResource("org/apache/commons/jelly/jelly.properties");
if (url != null) {
log.debug("Loading Jelly default tag libraries from: " + url);
try {
Modified: commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TestCoreTags.java
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TestCoreTags.java?rev=1798729&r1=1798728&r2=1798729&view=diff
==============================================================================
--- commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TestCoreTags.java (original)
+++ commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/TestCoreTags.java Wed Jun 14 17:30:30 2017
@@ -53,7 +53,7 @@ public class TestCoreTags extends TestCa
}
public void testArgs() throws Exception {
- InputStream in = new FileInputStream("src/test/org/apache/commons/jelly/test_args.jelly");
+ InputStream in = new FileInputStream("src/test/resources/org/apache/commons/jelly/test_args.jelly");
XMLParser parser = new XMLParser();
Script script = parser.parse(in);
script = script.compile();
@@ -109,7 +109,7 @@ public class TestCoreTags extends TestCa
public void testStaticNamespacedAttributes() throws Exception {
- InputStream in = new FileInputStream("src/test/org/apache/commons/jelly/testStaticNamespacedAttributes.jelly");
+ InputStream in = new FileInputStream("src/test/resources/org/apache/commons/jelly/testStaticNamespacedAttributes.jelly");
XMLParser parser = new XMLParser();
Script script = parser.parse(in);
script = script.compile();
Modified: commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java?rev=1798729&r1=1798728&r2=1798729&view=diff
==============================================================================
--- commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java (original)
+++ commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/core/TestIncludeTag.java Wed Jun 14 17:30:30 2017
@@ -114,7 +114,7 @@ public class TestIncludeTag extends Test
*/
public void testFileInclude() throws Exception {
// testing outermost
- setUpFromURL(new URL("file:src/test/org/apache/commons/jelly/core/a.jelly"));
+ setUpFromURL(new URL("file:src/test/resources/org/apache/commons/jelly/core/a.jelly"));
Script script = jelly.compileScript();
script.run(context,xmlOutput);
assertTrue("should have set 'c' variable to 'true'",
Modified: commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java
URL: http://svn.apache.org/viewvc/commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java?rev=1798729&r1=1798728&r2=1798729&view=diff
==============================================================================
--- commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java (original)
+++ commons/proper/jelly/trunk/src/test/java/org/apache/commons/jelly/test/xml/TestCData.java Wed Jun 14 17:30:30 2017
@@ -45,7 +45,7 @@ public class TestCData extends TestCase
*/
public void testCData() throws Exception {
Jelly jelly = new Jelly();
- jelly.setScript("file:src/test/org/apache/commons/jelly/test/xml/testCData.jelly");
+ jelly.setScript("file:src/test/resources/org/apache/commons/jelly/test/xml/testCData.jelly");
Script script = jelly.compileScript();
JellyContext context = new JellyContext();
script.run(context, XMLOutput.createDummyXMLOutput());