You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2013/01/05 16:04:02 UTC
svn commit: r1429303 - in /webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect: DialectTestSuite.java TestGetOriginalXMLStreamReader.java

Author: veithen
Date: Sat Jan  5 15:04:02 2013
New Revision: 1429303

URL: http://svn.apache.org/viewvc?rev=1429303&view=rev
Log:
Fixing the build on Sun/Oracle Java 1.6.

Modified:
    webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java
    webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetOriginalXMLStreamReader.java

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java?rev=1429303&r1=1429302&r2=1429303&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java Sat Jan  5 15:04:02 2013
@@ -45,6 +45,8 @@ public class DialectTestSuite extends Te
             props.setProperty("javax.xml.stream.XMLInputFactory", "com.sun.xml.internal.stream.XMLInputFactoryImpl");
             props.setProperty("javax.xml.stream.XMLOutputFactory", "com.sun.xml.internal.stream.XMLOutputFactoryImpl");
             builder.addImplementation(new StAXImplementation("JRE", ClassLoader.getSystemClassLoader(), props));
+            // SJSXP doesn't report whitespace in prolog
+            builder.exclude(TestGetTextInProlog.class, "(implementation=JRE)");
         }
         
         addParsersFromDirectory(builder, new File("parsers"));

Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetOriginalXMLStreamReader.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetOriginalXMLStreamReader.java?rev=1429303&r1=1429302&r2=1429303&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetOriginalXMLStreamReader.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetOriginalXMLStreamReader.java Sat Jan  5 15:04:02 2013
@@ -34,6 +34,8 @@ public class TestGetOriginalXMLStreamRea
         XMLInputFactory factory = staxImpl.newNormalizedXMLInputFactory();
         XMLStreamReader reader = factory.createXMLStreamReader(new StringReader("<root/>"));
         XMLStreamReader originalReader = XMLStreamReaderUtils.getOriginalXMLStreamReader(reader);
-        assertSame(staxImpl.getClassLoader(), originalReader.getClass().getClassLoader());
+        ClassLoader cl = originalReader.getClass().getClassLoader();
+        // cl == null covers the case where the StAX implementation is included in the JRE
+        assertTrue(cl == null || cl == staxImpl.getClassLoader());
     }
 }