diff options
Diffstat (limited to 'test/java/src')
21 files changed, 155 insertions, 28 deletions
diff --git a/test/java/src/org/apache/qetest/FileBasedTest.java b/test/java/src/org/apache/qetest/FileBasedTest.java index 8c4d911..368f5e3 100644 --- a/test/java/src/org/apache/qetest/FileBasedTest.java +++ b/test/java/src/org/apache/qetest/FileBasedTest.java @@ -26,6 +26,8 @@ */ package org.apache.qetest; +import org.apache.test.android.AndroidFileUtils; + import java.io.File; import java.io.FileInputStream; import java.util.Enumeration; @@ -125,7 +127,10 @@ public class FileBasedTest extends TestImpl public static final String OPT_OUTPUTDIR = "outputDir"; /** Field outputDir:holds String denoting local path for outputs. */ - protected String outputDir = "." + File.separator + "outputs"; + // Android-changed: The original directory isn't writeable on Android. + // protected String outputDir = "." + File.separator + "outputs"; + protected String outputDir = AndroidFileUtils.getOutputFile("." + File.separator + "outputs") + .getPath(); /** * Parameter: Where should get "gold" pre-validated XML files? diff --git a/test/java/src/org/apache/qetest/QetestUtils.java b/test/java/src/org/apache/qetest/QetestUtils.java index cf42e22..b13bc17 100644 --- a/test/java/src/org/apache/qetest/QetestUtils.java +++ b/test/java/src/org/apache/qetest/QetestUtils.java @@ -21,6 +21,8 @@ package org.apache.qetest; +import org.apache.test.android.AndroidFileUtils; + import java.io.File; import java.io.IOException; import java.lang.reflect.Method; @@ -70,6 +72,12 @@ public abstract class QetestUtils if (isCommonURL(filename)) return filename; + // Android-added: Look up the file in the java resources. + String androidUrl = AndroidFileUtils.getInputFileUrlString(filename); + if (androidUrl != null) { + return androidUrl; + } + File f = new File(filename); String tmp = null; try diff --git a/test/java/src/org/apache/qetest/Reporter.java b/test/java/src/org/apache/qetest/Reporter.java index 34efd06..2073726 100644 --- a/test/java/src/org/apache/qetest/Reporter.java +++ b/test/java/src/org/apache/qetest/Reporter.java @@ -26,6 +26,8 @@ */ package org.apache.qetest; +import org.apache.test.android.TestLogger; + import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -73,6 +75,9 @@ public class Reporter implements Logger public Reporter(Properties p) { ready = initialize(p); + + // Android-changed: Hard-coded AndroidLogger here. Otherwise, all test failures are silent. + addLogger(TestLogger.class.getName(), null); } /** If we're ready to start outputting yet. */ diff --git a/test/java/src/org/apache/qetest/dtm/TestDTMTrav.java b/test/java/src/org/apache/qetest/dtm/TestDTMTrav.java index 3711c3d..f417403 100644 --- a/test/java/src/org/apache/qetest/dtm/TestDTMTrav.java +++ b/test/java/src/org/apache/qetest/dtm/TestDTMTrav.java @@ -307,9 +307,9 @@ public class TestDTMTrav extends FileBasedTest // Traverse the axis and write node info to output file for (int atNode = at.first(lastNode); DTM.NULL != atNode; - atNode = at.next(lastNode, atNode)) - buf.append(getNodeInfo(dtm, atNode, " ")); - + atNode = at.next(lastNode, atNode)) { + buf.append(getNodeInfo(dtm, atNode, " ")); + } // Write results and close output file. writeClose(fos, buf); @@ -341,9 +341,9 @@ public class TestDTMTrav extends FileBasedTest // Traverse the axis and write node info to output file for (int atNode = at.first(lastNode); DTM.NULL != atNode; - atNode = at.next(lastNode, atNode)) - buf.append(getNodeInfo(dtm, atNode, " ")); - + atNode = at.next(lastNode, atNode)) { + buf.append(getNodeInfo(dtm, atNode, " ")); + } // Write results and close output file. writeClose(fos, buf); @@ -376,9 +376,9 @@ public class TestDTMTrav extends FileBasedTest // Traverse the axis and write node info to output file for (int atNode = at.first(lastNode); DTM.NULL != atNode; - atNode = at.next(lastNode, atNode)) - buf.append(getNodeInfo(dtm, atNode, " ")); - + atNode = at.next(lastNode, atNode)) { + buf.append(getNodeInfo(dtm, atNode, " ")); + } // Write results and close output file. writeClose(fos, buf); @@ -411,8 +411,9 @@ public class TestDTMTrav extends FileBasedTest // Traverse the axis and write node info to output file for (int atNode = at.first(lastNode); DTM.NULL != atNode; - atNode = at.next(lastNode, atNode)) - buf.append(getNodeInfo(dtm, atNode, " ")); + atNode = at.next(lastNode, atNode)) { + buf.append(getNodeInfo(dtm, atNode, " ")); + } // Write results and close output file. writeClose(fos, buf); @@ -446,9 +447,9 @@ public class TestDTMTrav extends FileBasedTest // Traverse the axis and write node info to output file for (int atNode = at.first(ANode); DTM.NULL != atNode; - atNode = at.next(ANode, atNode)) - buf.append(getNodeInfo(dtm, atNode, " ")); - + atNode = at.next(ANode, atNode)) { + buf.append(getNodeInfo(dtm, atNode, " ")); + } // Write results and close output file. writeClose(fos, buf); @@ -515,9 +516,9 @@ public class TestDTMTrav extends FileBasedTest // Traverse the axis and write node info to output file for (int atNode = at.first(ANode); DTM.NULL != atNode; - atNode = at.next(ANode, atNode)) - buf.append(getNodeInfo(dtm, atNode, " ")); - + atNode = at.next(ANode, atNode)) { + buf.append(getNodeInfo(dtm, atNode, " ")); + } // Write results and close output file. writeClose(fos, buf); diff --git a/test/java/src/org/apache/qetest/trax/ErrorListenerAPITest.java b/test/java/src/org/apache/qetest/trax/ErrorListenerAPITest.java index 1476ef0..1c80f05 100644 --- a/test/java/src/org/apache/qetest/trax/ErrorListenerAPITest.java +++ b/test/java/src/org/apache/qetest/trax/ErrorListenerAPITest.java @@ -32,6 +32,7 @@ import javax.xml.transform.ErrorListener; import javax.xml.transform.TransformerException; import org.apache.qetest.FileBasedTest; +import org.junit.Test; //------------------------------------------------------------------------- @@ -177,4 +178,10 @@ public class ErrorListenerAPITest extends FileBasedTest ErrorListenerAPITest app = new ErrorListenerAPITest(); app.doMain(args); } + + // Android-added: Run main method as a JUnit test case. + @Test + public void main() { + main(new String[0]); + } } diff --git a/test/java/src/org/apache/qetest/trax/ErrorListenerTest.java b/test/java/src/org/apache/qetest/trax/ErrorListenerTest.java index dfe40d8..e5a6789 100644 --- a/test/java/src/org/apache/qetest/trax/ErrorListenerTest.java +++ b/test/java/src/org/apache/qetest/trax/ErrorListenerTest.java @@ -49,6 +49,7 @@ import org.apache.qetest.OutputNameManager; import org.apache.qetest.QetestUtils; import org.apache.qetest.xsl.LoggingSAXErrorHandler; import org.apache.qetest.xsl.XSLTestfileInfo; +import org.junit.Test; import org.w3c.dom.Node; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; @@ -433,4 +434,10 @@ public class ErrorListenerTest extends FileBasedTest ErrorListenerTest app = new ErrorListenerTest(); app.doMain(args); } + + // Android-added: Run main method as a JUnit test case. + @Test + public void main() { + main(new String[0]); + } } diff --git a/test/java/src/org/apache/qetest/trax/ParameterTest.java b/test/java/src/org/apache/qetest/trax/ParameterTest.java index 0283516..14d8a2f 100644 --- a/test/java/src/org/apache/qetest/trax/ParameterTest.java +++ b/test/java/src/org/apache/qetest/trax/ParameterTest.java @@ -46,6 +46,7 @@ import org.apache.qetest.OutputNameManager; import org.apache.qetest.QetestUtils; import org.apache.qetest.xsl.XSLTestfileInfo; import org.apache.xml.utils.DefaultErrorHandler; +import org.junit.Test; //------------------------------------------------------------------------- @@ -577,4 +578,10 @@ public class ParameterTest extends FileBasedTest ParameterTest app = new ParameterTest(); app.doMain(args); } + + // Android-added: Run main method as a JUnit test case. + @Test + public void main() { + main(new String[0]); + } } diff --git a/test/java/src/org/apache/qetest/trax/TemplatesAPITest.java b/test/java/src/org/apache/qetest/trax/TemplatesAPITest.java index 61fc581..1e8d21c 100644 --- a/test/java/src/org/apache/qetest/trax/TemplatesAPITest.java +++ b/test/java/src/org/apache/qetest/trax/TemplatesAPITest.java @@ -41,6 +41,7 @@ import org.apache.qetest.OutputNameManager; import org.apache.qetest.QetestUtils; import org.apache.qetest.xsl.XSLTestfileInfo; import org.apache.xml.utils.DefaultErrorHandler; +import org.junit.Test; //------------------------------------------------------------------------- @@ -265,4 +266,10 @@ public class TemplatesAPITest extends FileBasedTest app.doMain(args); } + + // Android-added: Run main method as a JUnit test case. + @Test + public void main() { + main(new String[0]); + } } diff --git a/test/java/src/org/apache/qetest/trax/TransformerAPITest.java b/test/java/src/org/apache/qetest/trax/TransformerAPITest.java index fa0cf36..48acc0c 100644 --- a/test/java/src/org/apache/qetest/trax/TransformerAPITest.java +++ b/test/java/src/org/apache/qetest/trax/TransformerAPITest.java @@ -46,6 +46,7 @@ import org.apache.qetest.QetestUtils; import org.apache.qetest.TestletImpl; import org.apache.qetest.xsl.XSLTestfileInfo; import org.apache.xml.utils.DefaultErrorHandler; +import org.junit.Test; //------------------------------------------------------------------------- @@ -1312,4 +1313,10 @@ public class TransformerAPITest extends FileBasedTest TransformerAPITest app = new TransformerAPITest(); app.doMain(args); } + + // Android-added: Run main method as a JUnit test case. + @Test + public void main() { + main(new String[0]); + } } diff --git a/test/java/src/org/apache/qetest/trax/URIResolverTest.java b/test/java/src/org/apache/qetest/trax/URIResolverTest.java index fe4053d..be4d346 100644 --- a/test/java/src/org/apache/qetest/trax/URIResolverTest.java +++ b/test/java/src/org/apache/qetest/trax/URIResolverTest.java @@ -40,6 +40,7 @@ import org.apache.qetest.Logger; import org.apache.qetest.OutputNameManager; import org.apache.qetest.QetestUtils; import org.apache.qetest.xsl.XSLTestfileInfo; +import org.junit.Test; //------------------------------------------------------------------------- @@ -215,4 +216,10 @@ public class URIResolverTest extends FileBasedTest URIResolverTest app = new URIResolverTest(); app.doMain(args); } + + // Android-added: Run main method as a JUnit test case. + @Test + public void main() { + main(new String[0]); + } } diff --git a/test/java/src/org/apache/qetest/xalanj2/OutputSettingsTest.java b/test/java/src/org/apache/qetest/xalanj2/OutputSettingsTest.java index 1c8bdbf..0f026f0 100644 --- a/test/java/src/org/apache/qetest/xalanj2/OutputSettingsTest.java +++ b/test/java/src/org/apache/qetest/xalanj2/OutputSettingsTest.java @@ -41,6 +41,7 @@ import org.apache.qetest.Logger; import org.apache.qetest.OutputNameManager; import org.apache.qetest.QetestUtils; import org.apache.qetest.xsl.XSLTestfileInfo; +import org.junit.Test; //------------------------------------------------------------------------- @@ -251,4 +252,10 @@ public class OutputSettingsTest extends FileBasedTest OutputSettingsTest app = new OutputSettingsTest(); app.doMain(args); } + + // Android-added: Run main method as a JUnit test case. + @Test + public void main() { + main(new String[0]); + } } diff --git a/test/java/src/org/apache/qetest/xalanj2/PrefixResolverAPITest.java b/test/java/src/org/apache/qetest/xalanj2/PrefixResolverAPITest.java index b1ced99..57b725e 100644 --- a/test/java/src/org/apache/qetest/xalanj2/PrefixResolverAPITest.java +++ b/test/java/src/org/apache/qetest/xalanj2/PrefixResolverAPITest.java @@ -29,6 +29,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.apache.qetest.FileBasedTest; import org.apache.xml.utils.PrefixResolver; import org.apache.xml.utils.PrefixResolverDefault; +import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -185,4 +186,10 @@ public class PrefixResolverAPITest extends FileBasedTest PrefixResolverAPITest app = new PrefixResolverAPITest(); app.doMain(args); } + + // Android-added: Run main method as a JUnit test case. + @Test + public void main() { + main(new String[0]); + } } diff --git a/test/java/src/org/apache/qetest/xalanj2/ProgrammaticDOMTest.java b/test/java/src/org/apache/qetest/xalanj2/ProgrammaticDOMTest.java index 0d6e4d6..963040b 100644 --- a/test/java/src/org/apache/qetest/xalanj2/ProgrammaticDOMTest.java +++ b/test/java/src/org/apache/qetest/xalanj2/ProgrammaticDOMTest.java @@ -43,6 +43,7 @@ import org.apache.qetest.Logger; import org.apache.qetest.OutputNameManager; import org.apache.qetest.QetestUtils; import org.apache.qetest.xsl.XSLTestfileInfo; +import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.DocumentFragment; import org.w3c.dom.Element; @@ -510,4 +511,10 @@ public class ProgrammaticDOMTest extends FileBasedTest ProgrammaticDOMTest app = new ProgrammaticDOMTest(); app.doMain(args); } + + // Android-added: Run main method as a JUnit test case. + @Test + public void main() { + main(new String[0]); + } } diff --git a/test/java/src/org/apache/qetest/xalanj2/SerializedStylesheetTest.java b/test/java/src/org/apache/qetest/xalanj2/SerializedStylesheetTest.java index 428d0e9..3594ffd 100644 --- a/test/java/src/org/apache/qetest/xalanj2/SerializedStylesheetTest.java +++ b/test/java/src/org/apache/qetest/xalanj2/SerializedStylesheetTest.java @@ -44,6 +44,7 @@ import org.apache.qetest.Logger; import org.apache.qetest.OutputNameManager; import org.apache.qetest.QetestUtils; import org.apache.qetest.xsl.XSLTestfileInfo; +import org.junit.Test; //------------------------------------------------------------------------- @@ -222,4 +223,10 @@ public class SerializedStylesheetTest extends FileBasedTest SerializedStylesheetTest app = new SerializedStylesheetTest(); app.doMain(args); } + + // Android-added: Run main method as a JUnit test case. + @Test + public void main() { + main(new String[0]); + } } diff --git a/test/java/src/org/apache/qetest/xalanj2/SystemIDResolverAPITest.java b/test/java/src/org/apache/qetest/xalanj2/SystemIDResolverAPITest.java index f4b9d96..2a4ec78 100644 --- a/test/java/src/org/apache/qetest/xalanj2/SystemIDResolverAPITest.java +++ b/test/java/src/org/apache/qetest/xalanj2/SystemIDResolverAPITest.java @@ -22,6 +22,8 @@ package org.apache.qetest.xalanj2; import org.apache.qetest.FileBasedTest; import org.apache.xml.utils.SystemIDResolver; +import org.junit.Test; + import java.nio.file.Paths; /** @@ -179,4 +181,10 @@ public class SystemIDResolverAPITest extends FileBasedTest SystemIDResolverAPITest app = new SystemIDResolverAPITest(); app.doMain(args); } + + // Android-added: Run main method as a JUnit test case. + @Test + public void main() { + main(new String[0]); + } } diff --git a/test/java/src/org/apache/qetest/xalanj2/TestXPathAPI.java b/test/java/src/org/apache/qetest/xalanj2/TestXPathAPI.java index ff9bd85..1901b26 100644 --- a/test/java/src/org/apache/qetest/xalanj2/TestXPathAPI.java +++ b/test/java/src/org/apache/qetest/xalanj2/TestXPathAPI.java @@ -42,12 +42,14 @@ import javax.xml.transform.stream.StreamResult; import org.apache.qetest.FileBasedTest; import org.apache.qetest.OutputNameManager; import org.apache.qetest.xsl.XSLTestfileInfo; +import org.apache.test.android.AndroidFileUtils; import org.apache.xml.dtm.DTM; import org.apache.xml.dtm.DTMIterator; import org.apache.xml.dtm.DTMManager; import org.apache.xml.utils.PrefixResolverDefault; import org.apache.xpath.XPathAPI; import org.apache.xpath.objects.XObject; +import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.DocumentFragment; import org.w3c.dom.Node; @@ -355,7 +357,9 @@ public class TestXPathAPI extends FileBasedTest // Set up a DOM tree to query. reporter.logInfoMsg("Parsing input file "+filename); - InputSource in = new InputSource(new FileInputStream(filename)); + // Android-added: Look up the file in the java resources. + // InputSource in = new InputSource(new FileInputStream(filename)); + InputSource in = new InputSource(AndroidFileUtils.getInputFileUrl(filename).openStream()); DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance(); dfactory.setNamespaceAware(true); Document doc = dfactory.newDocumentBuilder().parse(in); @@ -430,7 +434,9 @@ public class TestXPathAPI extends FileBasedTest reporter.logInfoMsg("Parsing input file "+filename); // Set up a DOM tree to query. - InputSource in = new InputSource(new FileInputStream(filename)); + // Android-added: Look up the file in the java resources. + // InputSource in = new InputSource(new FileInputStream(filename)); + InputSource in = new InputSource(AndroidFileUtils.getInputFileUrl(filename).openStream()); DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance(); Document doc = dfactory.newDocumentBuilder().parse(in); return doc; @@ -456,7 +462,12 @@ public class TestXPathAPI extends FileBasedTest { TestXPathAPI app = new TestXPathAPI(); app.doMain(args); - } - + } + + // Android-added: Run main method as a JUnit test case. + @Test + public void main() { + main(new String[0]); + } } // end of class ApplyXPath diff --git a/test/java/src/org/apache/qetest/xalanj2/TraceListenerTest.java b/test/java/src/org/apache/qetest/xalanj2/TraceListenerTest.java index e8c88c7..b468e80 100644 --- a/test/java/src/org/apache/qetest/xalanj2/TraceListenerTest.java +++ b/test/java/src/org/apache/qetest/xalanj2/TraceListenerTest.java @@ -41,6 +41,7 @@ import org.apache.xalan.trace.TraceListener; import org.apache.xalan.trace.TraceManager; import org.apache.xalan.transformer.TransformerImpl; import org.apache.xalan.transformer.XalanProperties; +import org.junit.Test; //------------------------------------------------------------------------- @@ -478,4 +479,10 @@ public class TraceListenerTest extends FileBasedTest TraceListenerTest app = new TraceListenerTest(); app.doMain(args); } + + // Android-added: Run main method as a JUnit test case. + @Test + public void main() { + main(new String[0]); + } } diff --git a/test/java/src/org/apache/qetest/xalanj2/TransformStateTest.java b/test/java/src/org/apache/qetest/xalanj2/TransformStateTest.java index 9965373..3b6c31a 100644 --- a/test/java/src/org/apache/qetest/xalanj2/TransformStateTest.java +++ b/test/java/src/org/apache/qetest/xalanj2/TransformStateTest.java @@ -32,6 +32,7 @@ import java.util.Vector; import org.apache.qetest.FileBasedTest; import org.apache.qetest.Logger; +import org.junit.Test; //------------------------------------------------------------------------- @@ -296,4 +297,10 @@ public class TransformStateTest extends FileBasedTest TransformStateTest app = new TransformStateTest(); app.doMain(args); } + + // Android-added: Run main method as a JUnit test case. + @Test + public void main() { + main(new String[0]); + } } diff --git a/test/java/src/org/apache/qetest/xalanj2/TransformStateTestlet.java b/test/java/src/org/apache/qetest/xalanj2/TransformStateTestlet.java index 9a4e791..6c4aa73 100644 --- a/test/java/src/org/apache/qetest/xalanj2/TransformStateTestlet.java +++ b/test/java/src/org/apache/qetest/xalanj2/TransformStateTestlet.java @@ -306,9 +306,10 @@ public class TransformStateTestlet extends TestletImpl else { // Just log error case if transformer is ever null - if (null == transformer) - buf.append("\n <transformer>" - + "ERROR! Transformer was null!" + "</transformer>"); + if (null == transformer) { + buf.append("\n <transformer>" + + "ERROR! Transformer was null!" + "</transformer>"); + } } } diff --git a/test/java/src/org/apache/qetest/xalanj2/XalanDumper.java b/test/java/src/org/apache/qetest/xalanj2/XalanDumper.java index 8747fff..5046025 100644 --- a/test/java/src/org/apache/qetest/xalanj2/XalanDumper.java +++ b/test/java/src/org/apache/qetest/xalanj2/XalanDumper.java @@ -240,7 +240,9 @@ public abstract class XalanDumper { final TransformerImpl timpl = (TransformerImpl)trans; // We have a Xalan-J 2.x basic transformer - buf.append("getBaseURLOfSource=" + timpl.getBaseURLOfSource() + SEP); + + // Android-changed: TransformerImpl in 2.7.1 doesn't have getBaseURLOfSource() method. + // buf.append("getBaseURLOfSource=" + timpl.getBaseURLOfSource() + SEP); // Result getOutputTarget() // ContentHandler getInputContentHandler(boolean doDocFrag) // DeclHandler getInputDeclHandler() diff --git a/test/java/src/org/apache/qetest/xslwrapper/TraxWrapperUtils.java b/test/java/src/org/apache/qetest/xslwrapper/TraxWrapperUtils.java index 1b390e5..e64e586 100644 --- a/test/java/src/org/apache/qetest/xslwrapper/TraxWrapperUtils.java +++ b/test/java/src/org/apache/qetest/xslwrapper/TraxWrapperUtils.java @@ -258,7 +258,8 @@ public abstract class TraxWrapperUtils } else if (SET_TRACE_LISTENER.equals(key) && transformer instanceof TransformerImpl) { - TraceManager traceManager = ((TransformerImpl)transformer).getTraceManager(); + // Android-changed: TransformerImpl in 2.7.1 doesn't have getTraceManager() method. + // TraceManager traceManager = ((TransformerImpl)transformer).getTraceManager(); try { FileOutputStream writeStream = new FileOutputStream((String)value); PrintWriter printWriter = new PrintWriter(writeStream, true); @@ -267,7 +268,8 @@ public abstract class TraxWrapperUtils traceListener.m_traceGeneration = true; traceListener.m_traceSelection = true; traceListener.m_traceTemplates = true; - traceManager.addTraceListener(traceListener); + // Android-changed: TransformerImpl in 2.7.1 doesn't have getTraceManager() method. + // traceManager.addTraceListener(traceListener); } catch (FileNotFoundException fnfe) { System.out.println("File not found: " + fnfe); } catch (Exception e) { |