svn commit: r1308121 - in /webservices/commons/trunk/modules/axiom/modules: axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/OMImplementationTest.java axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java

[veithen]

Author: veithen
Date: Sun Apr  1 14:05:59 2012
New Revision: 1308121

URL: http://svn.apache.org/viewvc?rev=1308121&view=rev
Log:
Removed some unnecessary exclusions.

Modified:
    
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/OMImplementationTest.java
    
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java

Modified: 
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/OMImplementationTest.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/OMImplementationTest.java?rev=1308121&r1=1308120&r2=1308121&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/OMImplementationTest.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/modules/axiom-dom/src/test/java/org/apache/axiom/om/impl/dom/OMImplementationTest.java
 Sun Apr  1 14:05:59 2012
@@ -27,8 +27,6 @@ import org.apache.axiom.ts.om.builder.Te
 import org.apache.axiom.ts.om.container.TestSerialize;
 import org.apache.axiom.ts.om.document.TestDigest;
 import org.apache.axiom.ts.om.element.TestGetChildrenWithName4;
-import 
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderCDATAEventFromElement;
-import 
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderWithOMSourcedElementDescendant;
 import org.apache.axiom.ts.om.factory.TestCreateOMElementWithGeneratedPrefix;
 import org.apache.axiom.ts.om.factory.TestCreateOMElementWithNamespaceInScope;
 import org.apache.axiom.ts.om.node.TestInsertSiblingAfterOnChild;
@@ -47,12 +45,6 @@ public class OMImplementationTest extend
         builder.exclude(TestCreateOMElementWithNamespaceInScope.class, 
"(variant=QName,OMContainer)");
         builder.exclude(TestCreateOMElementWithNamespaceInScope.class, 
"(variant=String,OMNamespace,OMContainer)");
         
-        // DOOM doesn't support CDATA sections
-        builder.exclude(TestGetXMLStreamReaderCDATAEventFromElement.class);
-        
-        // AXIOM-201
-        
builder.exclude(TestGetXMLStreamReaderWithOMSourcedElementDescendant.class);
-        
         // TODO: this case is not working because Axiom generates an XML 
declaration
         //       but uses another charset encoding to serialize the document
         builder.exclude(TestSerialize.class, 
"(&(file=iso-8859-1.xml)(container=document))");

Modified: 
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java?rev=1308121&r1=1308120&r2=1308121&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
 Sun Apr  1 14:05:59 2012
@@ -203,7 +203,9 @@ public class OMTestSuiteBuilder extends 
         addTest(new 
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderOnNonRootElement(metaFactory,
 true));
         addTest(new 
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderOnNonRootElement(metaFactory,
 false));
         addTest(new 
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderWithNamespaceURIInterning(metaFactory));
-        addTest(new 
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderWithOMSourcedElementDescendant(metaFactory));
+        if (supportsOMSourcedElement) {
+            addTest(new 
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderWithOMSourcedElementDescendant(metaFactory));
+        }
         addTest(new 
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderWithoutCachingPartiallyBuilt(metaFactory));
         addTest(new 
org.apache.axiom.ts.om.element.TestGetXMLStreamReaderWithPreserveNamespaceContext(metaFactory));
         addTest(new 
org.apache.axiom.ts.om.element.TestIsCompleteAfterAddingIncompleteChild(metaFactory));