[bugfix] Allow XSuite to use an EXPath Repo when examining XQSuite tests in XQueryTestRunner#extractTestInfo

Author: adamretter

exist-core/src/main/java/org/exist/repo/ExistRepository.java

@@ -87,7 +87,7 @@ public void configure(final Configuration configuration) throws BrokerPoolServic
 
     @Override
     public void prepare(final BrokerPool brokerPool) throws BrokerPoolServiceException {
-        if(!Files.exists(expathDir)) {
+        if (!Files.exists(expathDir) && brokerPool != null) {
             moveOldRepo(brokerPool.getConfiguration().getExistHome(), expathDir);
         }
         try {

exist-core/src/main/java/org/exist/storage/BrokerPool.java

@@ -506,7 +506,7 @@ private void _initialize() throws EXistException, DatabaseConfigurationException
 
         this.symbols = servicesManager.register(new SymbolTable());
 
-        this.expathRepo = Optional.ofNullable(new ExistRepository());
+        this.expathRepo = Optional.of(new ExistRepository());
         expathRepo.ifPresent(servicesManager::register);
         servicesManager.register(new ClasspathHelper());
 

exist-core/src/main/java/org/exist/test/runner/XQueryTestRunner.java

@@ -25,11 +25,13 @@
 import com.evolvedbinary.j8fu.tuple.Tuple2;
 import org.exist.EXistException;
 import org.exist.dom.QName;
+import org.exist.repo.ExistRepository;
 import org.exist.security.PermissionDeniedException;
 import org.exist.source.ClassLoaderSource;
 import org.exist.source.FileSource;
 import org.exist.source.Source;
 import org.exist.storage.BrokerPool;
+import org.exist.storage.BrokerPoolServiceException;
 import org.exist.util.Configuration;
 import org.exist.util.ConfigurationHelper;
 import org.exist.util.DatabaseConfigurationException;
@@ -88,7 +90,17 @@ private static Configuration getConfiguration() throws DatabaseConfigurationExce
     private static XQueryTestInfo extractTestInfo(final Path path) throws InitializationError {
         try {
             final Configuration config = getConfiguration();
+
+            final ExistRepository expathRepo = new ExistRepository();
+            try {
+                expathRepo.configure(config);
+                expathRepo.prepare(null);
+            } catch (final BrokerPoolServiceException e) {
+                throw new InitializationError(e);
+            }
+
             final XQueryContext xqueryContext = new XQueryContext(config);
+            xqueryContext.setTestRepository(Optional.of(expathRepo));
 
             final Source xquerySource = new FileSource(path, UTF_8, false);
             final XQuery xquery = new XQuery();

exist-core/src/main/java/org/exist/xquery/XQueryContext.java

@@ -97,6 +97,7 @@
 import org.exist.xquery.value.*;
 import org.w3c.dom.Node;
 
+import static com.evolvedbinary.j8fu.OptionalUtil.or;
 import static com.evolvedbinary.j8fu.tuple.Tuple.Tuple;
 import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE;
 import static javax.xml.XMLConstants.XML_NS_PREFIX;
@@ -425,6 +426,8 @@ public class XQueryContext implements BinaryValueManager, Context {
     private final Map<QName, DecimalFormat> staticDecimalFormats = HashMap(Tuple(UNNAMED_DECIMAL_FORMAT, DecimalFormat.UNNAMED));
 
     // Only used for testing, e.g. {@link org.exist.test.runner.XQueryTestRunner}.
+    private Optional<ExistRepository> testRepository = Optional.empty();
+
     public XQueryContext() {
         this(null, null, null);
     }
@@ -512,13 +515,26 @@ public void setHttpContext(final HttpContext httpContext) {
         this.httpContext = httpContext;
     }
 
+    /**
+     * Set the EXPath repository used for testing,
+     * only should be called from {@link org.exist.test.runner.XQueryTestRunner}.
+     *
+     * @param testRepository the EXPath repository to use for test execution.
+     */
+    public void setTestRepository(final Optional<ExistRepository> testRepository) {
+        this.testRepository = testRepository;
+    }
+
     /**
      * Get the EXPath repository configured for the BrokerPool, if present.
      *
-     * @return the EXPath respository if present.
+     * @return the EXPath repository if present.
      */
     public Optional<ExistRepository> getRepository() {
-        return Optional.ofNullable(getBroker()).map(DBBroker::getBrokerPool).flatMap(BrokerPool::getExpathRepo);
+        return or(
+                testRepository,
+            () -> Optional.ofNullable(getBroker()).map(DBBroker::getBrokerPool).flatMap(BrokerPool::getExpathRepo)
+        );
     }
 
     /**