[bugfix] Enable tests that were previously ignored that now pass

Author: adamretter

exist-core/src/test/java/org/exist/xquery/XQueryTest.java

@@ -69,7 +69,6 @@
 import org.xml.sax.SAXException;
 import org.xmldb.api.DatabaseManager;
 import org.xmldb.api.base.Collection;
-import org.xmldb.api.base.Resource;
 import org.xmldb.api.base.XMLDBException;
 import org.xmldb.api.modules.BinaryResource;
 import org.xmldb.api.modules.CollectionManagementService;
@@ -727,11 +726,10 @@ public void typedVariables() throws XMLDBException {
         query = "let $v as document-node() :=  doc('" + XmldbURI.ROOT_COLLECTION + "/test/" + NUMBERS_XML + "') \n" + "return $v";
         try (final EXistResourceSet result = (EXistResourceSet) service.query(query)) {
             assertEquals("XQuery: " + query, 1, result.getSize());
-            //TODO : no way to test the node type ?
-            //assertEquals( "XQuery: " + query, Node.DOCUMENT_NODE, ((XMLResource)result.getResource(0)));
             try (final EXistResource resource = (EXistResource) result.getResource(0)) {
                 final Node n = ((XMLResource) resource).getContentAsDOM();
                 assertTrue(n instanceof Document);
+                assertEquals("XQuery: " + query, Node.DOCUMENT_NODE, n.getNodeType());
                 assertEquals("XQuery: " + query, "test", ((Document) n).getDocumentElement().getNodeName());
             }
         }
@@ -909,33 +907,37 @@ public void improbableAxesAndNodeTestsCombinations() throws XMLDBException {
         }
         assertTrue(exceptionThrown);
 
-        //TODO : uncomment when PI are OK
-
-        /*
         query = "let $a := <x>a<?foo ?>c</x>/self::processing-instruction('foo') return <z>{$a}</z>";
         try (final EXistResourceSet result = (EXistResourceSet) service.query(query)) {
             assertEquals( "XQuery: " + query, 1, result.getSize() );
-            assertEquals( "XQuery: " + query, "<z/>", ((XMLResource)result.getResource(0)).getContent());
+            try (final EXistResource resource = (EXistResource) result.getResource(0)) {
+                assertEquals("XQuery: " + query, "<z/>", resource.getContent());
+            }
         }
 
         query = "let $a := <x>a<?foo ?>c</x>/parent::processing-instruction('foo') return <z>{$a}</z>";
         try (final EXistResourceSet result = (EXistResourceSet) service.query(query)) {
             assertEquals( "XQuery: " + query, 1, result.getSize() );
-            assertEquals( "XQuery: " + query, "<z/>", ((XMLResource)result.getResource(0)).getContent());
+            try (final EXistResource resource = (EXistResource) result.getResource(0)) {
+                assertEquals("XQuery: " + query, "<z/>", resource.getContent());
+            }
         }
 
         query = "let $a := <x>a<?foo ?>c</x>/ancestor::processing-instruction('foo') return <z>{$a}</z>";
         try (final EXistResourceSet result = (EXistResourceSet) service.query(query)) {
             assertEquals( "XQuery: " + query, 1, result.getSize() );
-            assertEquals( "XQuery: " + query, "<z/>", ((XMLResource)result.getResource(0)).getContent());
+            try (final EXistResource resource = (EXistResource) result.getResource(0)) {
+                assertEquals("XQuery: " + query, "<z/>", resource.getContent());
+            }
         }
 
         query = "let $a := <x>a<?foo ?>c</x>/ancestor-or-self::processing-instruction('foo') return <z>{$a}</z>";
         try (final EXistResourceSet result = (EXistResourceSet) service.query(query)) {
             assertEquals( "XQuery: " + query, 1, result.getSize() );
-            assertEquals( "XQuery: " + query, "<z/>", ((XMLResource)result.getResource(0)).getContent());
+            try (final EXistResource resource = (EXistResource) result.getResource(0)) {
+                assertEquals("XQuery: " + query, "<z/>", resource.getContent());
+            }
         }
-        */
 
 //			This one is intercepted by the parser
         query = "let $a := <x>a<?foo ?>c</x>/attribute::processing-instruction('foo') return <z>{$a}</z>";
@@ -1506,13 +1508,12 @@ public void functionDoc() throws XMLDBException, IOException, SAXException {
         boolean exceptionThrown = false;
         String message = "";
         try (final EXistResourceSet result = (EXistResourceSet) service.query(query)) {
-            //TODO : to be decided !
-            //assertTrue(exceptionThrown);
             assertEquals(0, result.getSize());
         } catch (final XMLDBException e) {
             exceptionThrown = true;
             message = e.getMessage();
         }
+        assertFalse(message, exceptionThrown);
 
         query = "doc-available('" + XmldbURI.ROOT_COLLECTION + "/test/" + NUMBERS_XML + "')";
         try (final EXistResourceSet result = (EXistResourceSet) service.query(query)) {
@@ -1873,11 +1874,10 @@ public void serialization() throws XMLDBException {
         message = "";
         try (final EXistResourceSet result = (EXistResourceSet) service.query(query)) {
             // needed to make sure that result is closed
-        } catch (final XMLDBException e) {
-            message = e.getMessage();
+            try (final EXistResource resource = (EXistResource) result.getResource(0)) {
+                assertEquals("bar", resource.getContent());
+            }
         }
-        //TODO : how toserialize this resultand get the error ? -pb
-        //assertTrue(message.indexOf("XQDY0025") > -1);
     }
 
     /** CAUTION side effect on field xml
@@ -1949,9 +1949,7 @@ public void xupdateWithAdjacentTextNodes() throws XMLDBException {
         }
     }
 
-    //TODO : understand this test and make sure that the expected result is correct
-    //expected:<3> but was:<2>
-    @Ignore
+    @Ignore("Understand this test and make sure that the expected result is correct - expected:<3> but was:<2>")
     @Test
     public void xupdateAttributesAndElements() throws XMLDBException {
         final String query =
@@ -2619,7 +2617,6 @@ public void stringOfEmptySequence_1841105() throws XMLDBException {
     /**
      * <a href="http://sourceforge.net/support/tracker.php?aid=2871975">http://sourceforge.net/support/tracker.php?aid=2871975</a>
      */
-    @Ignore
     @Test
     public void stringOfEmptySequenceWithExplicitContext_2871975() throws XMLDBException {
         // OK