[refactor] Improve XQsuite code..

dizzzz · dizzzz · commit 51ce7160bbc5 · 2026-02-06T21:06:57.000+01:00
diff --git a/exist-core/src/main/java/org/exist/test/runner/AbstractTestRunner.java b/exist-core/src/main/java/org/exist/test/runner/AbstractTestRunner.java
@@ -119,7 +119,7 @@ protected static Sequence executeQuery(final BrokerPool brokerPool, final Source
         }
     }
 
-    protected static String checkDescription(Object source,  String description) {
+    protected static String checkDescription(final Object source, final String description) {
         if (description == null) {
             throw new IllegalArgumentException(source + " description is null");
         }
diff --git a/exist-core/src/main/java/org/exist/test/runner/ExtTestErrorFunction.java b/exist-core/src/main/java/org/exist/test/runner/ExtTestErrorFunction.java
@@ -154,7 +154,7 @@ private XPathException errorMapAsXPathException(final MapType errorMap) throws X
             final String methodName = matcherAt.group(2);
             final String fileName = matcherAt.group(3);
             final String lineNumber = matcherAt.group(4);
-            return new StackTraceElement(declaringClass, methodName, fileName, Integer.valueOf(lineNumber));
+            return new StackTraceElement(declaringClass, methodName, fileName, Integer.parseInt(lineNumber));
         } else {
             return null;
         }
diff --git a/exist-core/src/main/java/org/exist/test/runner/XMLTestRunner.java b/exist-core/src/main/java/org/exist/test/runner/XMLTestRunner.java
@@ -164,14 +164,14 @@ private static XMLTestInfo extractTestInfo(final Path path, final Document doc)
     }
 
     private String getSuiteName() {
-        return "xmlts." + info.getName();
+        return "xmlts." + info.name();
     }
 
     @Override
     public Description getDescription() {
         final String suiteName = checkDescription(info, getSuiteName());
         final Description description = Description.createSuiteDescription(suiteName);
-        for (final String childName : info.getChildNames()) {
+        for (final String childName : info.childNames()) {
             description.addChild(Description.createTestDescription(suiteName, checkDescription(info, childName)));
         }
         return description;
@@ -225,29 +225,6 @@ private static Document parse(final Path path) throws ParserConfigurationExcepti
         return adapter.getDocument();
     }
 
-    private static class XMLTestInfo {
-        @Nullable private final String name;
-        @Nullable private final String description;
-        private final List<String> childNames;
-
-        private XMLTestInfo(@Nullable final String name, @Nullable final String description, final List<String> childNames) {
-            this.name = name;
-            this.description = description;
-            this.childNames = childNames;
-        }
-
-        @Nullable
-        public String getName() {
-            return name;
-        }
-
-        @Nullable
-        public String getDescription() {
-            return description;
-        }
-
-        public List<String> getChildNames() {
-            return childNames;
-        }
+    private record XMLTestInfo(@Nullable String name, @Nullable String description, List<String> childNames) {
     }
 }
diff --git a/exist-core/src/main/java/org/exist/test/runner/XQueryTestRunner.java b/exist-core/src/main/java/org/exist/test/runner/XQueryTestRunner.java
@@ -173,11 +173,11 @@ private static XQueryTestInfo extractTestInfo(final Path path) throws Initializa
     }
 
     private String getSuiteName() {
-        if (info.getNamespace() == null) {
+        if (info.namespace() == null) {
             return path.getFileName().toString();
         }
 
-        return namespaceToPackageName(info.getNamespace());
+        return namespaceToPackageName(info.namespace());
     }
 
     private String namespaceToPackageName(final String namespace) {
@@ -220,8 +220,8 @@ private void pathToPackageName(String path, final StringBuilder buffer) {
     public Description getDescription() {
         final String suiteName = checkDescription(this, getSuiteName());
         final Description description = Description.createSuiteDescription(suiteName);
-        for (final XQueryTestInfo.TestFunctionDef testFunctionDef : info.getTestFunctions()) {
-            description.addChild(Description.createTestDescription(suiteName, checkDescription(testFunctionDef, testFunctionDef.getLocalName())));
+        for (final XQueryTestInfo.TestFunctionDef testFunctionDef : info.testFunctions()) {
+            description.addChild(Description.createTestDescription(suiteName, checkDescription(testFunctionDef, testFunctionDef.localName())));
         }
         return description;
     }
@@ -257,45 +257,9 @@ public void run(final RunNotifier notifier) {
         }
     }
 
-    private static class XQueryTestInfo {
-        private final String prefix;
-        private final String namespace;
-        private final List<TestFunctionDef> testFunctions;
+    private record XQueryTestInfo(String prefix, String namespace, List<TestFunctionDef> testFunctions) {
 
-        private XQueryTestInfo(final String prefix, final String namespace, final List<TestFunctionDef> testFunctions) {
-            this.prefix = prefix;
-            this.namespace = namespace;
-            this.testFunctions = testFunctions;
-        }
-
-        public String getPrefix() {
-            return prefix;
-        }
-
-        public String getNamespace() {
-            return namespace;
-        }
-
-        public List<TestFunctionDef> getTestFunctions() {
-            return testFunctions;
-        }
-
-        private static class TestFunctionDef {
-            private final String localName;
-            private final int arity;
-
-            private TestFunctionDef(final String localName, final int arity) {
-                this.localName = localName;
-                this.arity = arity;
-            }
-
-            public String getLocalName() {
-                return localName;
-            }
-
-            public int getArity() {
-                return arity;
+        private record TestFunctionDef(String localName, int arity) {
             }
         }
-    }
 }
diff --git a/exist-core/src/main/java/org/exist/test/runner/XSuite.java b/exist-core/src/main/java/org/exist/test/runner/XSuite.java
@@ -47,10 +47,10 @@
 /**
  * Using <code>XSuite</code> as a runner allows you to manually
  * build a suite containing tests from both:
- *
+ * <p>
  * 1. XQSuite - as defined in $EXIST_HOME/src/org/exist/xquery/lib/xqsuite/xqsuite.xql
  * 2. XML Test - as defined in $EXIST_HOME/src/org/exist/xquery/lib/test.xq
- *
+ * <p>
  * To use it, annotate a class
  * with <code>@RunWith(XSuite.class)</code> and <code>@XSuiteClasses({"extensions/my-extension/src/test/xquery", ...})</code>.
  * When you run this class, it will run all the tests in all the suite classes.
@@ -67,7 +67,7 @@ public class XSuite extends ParentRunner<Runner> {
     public static Runner emptySuite() {
         try {
             return new XSuite((Class<?>) null, new String[0]);
-        } catch (InitializationError e) {
+        } catch (final InitializationError e) {
             throw new RuntimeException("This shouldn't be possible");
         }
     }
@@ -204,7 +204,7 @@ private static List<Runner> getRunners(final String[] suites, final boolean para
                 if (Files.isDirectory(path)) {
                     // directory of files of test(s)
                     try (final Stream<Path> children = Files.list(path)) {
-                        for(final Path child : children.collect(Collectors.toList())) {
+                        for(final Path child : children.toList()) {
                             if(!Files.isDirectory(child)) {
                                 final Runner runner = getRunner(child, parallel);
                                 if(runner != null) {

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ protected static Sequence executeQuery(final BrokerPool brokerPool, final Source`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
`122`		`- protected static String checkDescription(Object source, String description) {`
	`122`	`+ protected static String checkDescription(final Object source, final String description) {`
`123`	`123`	`if (description == null) {`
`124`	`124`	`throw new IllegalArgumentException(source + " description is null");`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ private XPathException errorMapAsXPathException(final MapType errorMap) throws X`
`154`	`154`	`final String methodName = matcherAt.group(2);`
`155`	`155`	`final String fileName = matcherAt.group(3);`
`156`	`156`	`final String lineNumber = matcherAt.group(4);`
`157`		`- return new StackTraceElement(declaringClass, methodName, fileName, Integer.valueOf(lineNumber));`
	`157`	`+ return new StackTraceElement(declaringClass, methodName, fileName, Integer.parseInt(lineNumber));`
`158`	`158`	`} else {`
`159`	`159`	`return null;`
`160`	`160`	`}`