[test] Expand QuerySessionTest to also cover local XML:DB API

Author: adamretter

exist-core/src/test/java/org/exist/xmlrpc/QuerySessionTest.java

@@ -51,6 +51,8 @@
 import org.exist.TestUtils;
 import org.exist.test.ExistWebServer;
 import org.junit.*;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 import org.xml.sax.SAXException;
 import org.xmldb.api.DatabaseManager;
 import org.xmldb.api.base.*;
@@ -59,20 +61,38 @@
 import org.xmldb.api.modules.XQueryService;
 
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
+@RunWith(Parameterized.class)
 public class QuerySessionTest {
 
+    @Parameterized.Parameters(name = "{0}")
+    public static java.util.Collection<Object[]> data() {
+        return Arrays.asList(new Object[][] {
+            { "local", "xmldb:exist://" },
+            { "remote", "xmldb:exist://localhost:" + PORT_PLACEHOLDER + "/xmlrpc" }
+        });
+    }
+
+    @Parameterized.Parameter
+    public String apiName;
+
+    @Parameterized.Parameter(value = 1)
+    public String baseUri;
+
+    private boolean storedTestData = false;
+
     private static final Logger LOG = LogManager.getLogger(QuerySessionTest.class);
 
     @ClassRule
     public final static ExistWebServer existWebServer = new ExistWebServer(true, false, true, true);
+    private static final String PORT_PLACEHOLDER = "${PORT}";
 
     private final static String generateXQ =
             "declare function local:random-sequence($length as xs:integer, $G as map(xs:string, item())) {\n"
@@ -101,8 +121,8 @@ public class QuerySessionTest {
             "declare variable $n external;" +
             "//chapter[@xml:id eq $n]";
 
-    private static String getBaseUri() {
-        return "xmldb:exist://localhost:" + existWebServer.getPort() + "/xmlrpc";
+    private String getBaseUri() {
+        return baseUri.replace(PORT_PLACEHOLDER, Integer.toString(existWebServer.getPort()));
     }
 
     private final static int N_THREADS = 10;
@@ -111,19 +131,25 @@ private static String getBaseUri() {
 
     private Random random = new Random();
 
-    @Test (expected=XMLDBException.class)
+    @Test
     public void manualRelease() throws XMLDBException {
         Collection test = DatabaseManager.getCollection(getBaseUri() + "/db/rpctest", TestUtils.ADMIN_DB_USER, TestUtils.ADMIN_DB_PWD);
         XQueryService service = test.getService(XQueryService.class);
         ResourceSet result = service.query("//chapter[@xml:id eq 'chapter1']");
-        assertEquals(1, result.getSize());
+        assertTrue(result.getSize() > 0);
 
-        // clear should release the query result on the server
-        result.clear();
+        if (!"local".equals(apiName)) {
+            // clear should release the query result on the server
+            result.clear();
 
-        // the result has been cleared already. we should get an exception here
-        Resource members = result.getMembersAsResource();
-        members.getContent();
+            // As the result has been cleared already, we should get an exception below
+            try {
+                result.getMembersAsResource();
+                fail("Expected XMLDBException from calling Resource#getMembersAsResource() after ResourceSet#clear() when using the Remote XML:DB API");
+            } catch (final XMLDBException e) {
+                assertEquals("Failed to invoke method retrieveAllFirstChunk in class org.exist.xmlrpc.RpcConnection: result set unknown or timed out", e.getMessage());
+            }
+        }
     }
 
     @Test
@@ -167,42 +193,28 @@ public void run() {
         }
     }
 
-	@BeforeClass
-    public static void startServer() throws ClassNotFoundException, IllegalAccessException, InstantiationException, XMLDBException, SAXException {
-        // initialize XML:DB driver
-        Class<?> cl = Class.forName("org.exist.xmldb.DatabaseImpl");
-        Database database = (Database) cl.newInstance();
-        DatabaseManager.registerDatabase(database);
-
-        Collection root = DatabaseManager.getCollection(getBaseUri() + "/db", TestUtils.ADMIN_DB_USER, TestUtils.ADMIN_DB_PWD);
-        
-        CollectionManagementService mgmt =
-                root.getService(CollectionManagementService.class);
-        Collection test = mgmt.createCollection("rpctest");
-
-        final TestDataGenerator generator = new TestDataGenerator("xdb", DOC_COUNT);
-        try {
-            final Path[] files = generator.generate(test, generateXQ);
-            for (int i = 0; i < files.length; i++) {
-                Resource resource = test.createResource(files[i].getFileName().toString(), XMLResource.class);
-                resource.setContent(files[i].toFile());
-                test.storeResource(resource);
+    @Before
+    public void storeTestData() throws XMLDBException, SAXException {
+        if (!storedTestData) {
+            // NOTE(AR) we only need to store the test data once!
+            final Collection root = DatabaseManager.getCollection(getBaseUri() + "/db", TestUtils.ADMIN_DB_USER, TestUtils.ADMIN_DB_PWD);
+
+            final CollectionManagementService mgmt = root.getService(CollectionManagementService.class);
+            final Collection test = mgmt.createCollection("rpctest");
+
+            final TestDataGenerator generator = new TestDataGenerator("xdb", DOC_COUNT);
+            try {
+                final Path[] files = generator.generate(test, generateXQ);
+                for (int i = 0; i < files.length; i++) {
+                    final Resource resource = test.createResource(files[i].getFileName().toString(), XMLResource.class);
+                    resource.setContent(files[i].toFile());
+                    test.storeResource(resource);
+                }
+            } finally {
+                generator.releaseAll();
             }
-        } finally {
-            generator.releaseAll();
-        }
-    }
 
-    @AfterClass
-    public static void stopServer() throws XMLDBException {
-        Collection root = DatabaseManager.getCollection(getBaseUri() + "/db", TestUtils.ADMIN_DB_USER, TestUtils.ADMIN_DB_PWD);
-        CollectionManagementService mgmt =
-                root.getService(CollectionManagementService.class);
-        mgmt.removeCollection("rpctest");
-
-        Collection config = DatabaseManager.getCollection(getBaseUri() + "/db/system/config/db", "admin", "");
-        mgmt =
-                config.getService(CollectionManagementService.class);
-        mgmt.removeCollection("rpctest");
+            storedTestData = true;
+        }
     }
 }