Merge "Run ApacheXML tests in CtsLibcoreTestCases"

10 files changed, 72 insertions, 8 deletions

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()