[test] refactor and improve UnknownAtomicTypeTest

Author: line-o

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

@@ -21,81 +21,66 @@
  */
 package org.exist.xquery;
 
-import org.exist.test.ExistXmldbEmbeddedServer;
-import org.junit.ClassRule;
+import org.exist.EXistException;
+import org.exist.security.PermissionDeniedException;
+import org.exist.test.XQueryCompilationTest;
 import org.junit.Test;
-import org.xmldb.api.base.XMLDBException;
-import org.xmldb.api.modules.XQueryService;
 
-import static org.junit.Assert.*;
+import static org.exist.test.XQueryAssertions.assertXQStaticError;
 
 /**
  * Ensure tests for unknown atomic types are reported with location information
  * https://github.com/eXist-db/exist/issues/3518
  *
  * @author <a href="mailto:[email protected]">Juri Leino</a>
  */
-public class UnknownAtomicTypeTest {
-    @ClassRule
-    public static final ExistXmldbEmbeddedServer existEmbeddedServer = new ExistXmldbEmbeddedServer(true, true, true);
-
+public class UnknownAtomicTypeTest extends XQueryCompilationTest {
     @Test
-    public void letVariable() throws XMLDBException {
-        final String query = "let $x as y := 0 return $x";
-        final String error = "err:XPST0051 Unknown simple type y [at line 1, column 11]";
-        assertCompilationError(query, error);
+    public void letVariable() throws EXistException, PermissionDeniedException {
+        final String query = "let $x as a := 0 return $x";
+        final String error = "Unknown simple type a";
+        assertXQStaticError(ErrorCodes.XPST0051, 1, 11, error, compileQuery(query));
     }
 
     @Test
-    public void functionReturnType() throws XMLDBException {
-        final String query = "function () as y { () }";
-        final String error = "err:XPST0051 Unknown simple type y [at line 1, column 16]";
-        assertCompilationError(query, error);
+    public void functionReturnType() throws EXistException, PermissionDeniedException {
+        final String query = "function () as b { () }";
+        final String error = "Unknown simple type b";
+        assertXQStaticError(ErrorCodes.XPST0051, 1, 16, error, compileQuery(query));
     }
 
     @Test
-    public void functionParameterType() throws XMLDBException {
-        final String query = "function ($x as y) { $x }";
-        final String error = "err:XPST0051 Unknown simple type y [at line 1, column 17]";
-        assertCompilationError(query, error);
+    public void functionParameterType() throws EXistException, PermissionDeniedException {
+        final String query = "function ($x as c) { $x }";
+        final String error = "Unknown simple type c";
+        assertXQStaticError(ErrorCodes.XPST0051, 1, 17, error, compileQuery(query));
     }
 
     @Test
-    public void instanceOf() throws XMLDBException {
-        final String query = "1 instance of y";
-        final String error = "err:XPST0051 Unknown simple type y [at line 1, column 15]";
-        assertCompilationError(query, error);
+    public void instanceOf() throws EXistException, PermissionDeniedException {
+        final String query = "1 instance of d";
+        final String error = "Unknown simple type d";
+        assertXQStaticError(ErrorCodes.XPST0051, 1, 15, error, compileQuery(query));
     }
 
     @Test
-    public void treatAs() throws XMLDBException {
-        final String query = "1 treat as y";
-        final String error = "err:XPST0051 Unknown simple type y [at line 1, column 12]";
-        assertCompilationError(query, error);
+    public void treatAs() throws EXistException, PermissionDeniedException {
+        final String query = "1 treat as e";
+        final String error = "Unknown simple type e";
+        assertXQStaticError(ErrorCodes.XPST0051, 1, 12, error, compileQuery(query));
     }
 
     @Test
-    public void castAs() throws XMLDBException {
-        final String query = "1 cast as y";
-        final String error = "err:XPST0051 Unknown simple type y [at line 1, column 11]";
-        assertCompilationError(query, error);
+    public void castAs() throws EXistException, PermissionDeniedException {
+        final String query = "1 cast as f";
+        final String error = "Unknown simple type f";
+        assertXQStaticError(ErrorCodes.XPST0051, 1, 11, error, compileQuery(query));
     }
 
     @Test
-    public void castableAs() throws XMLDBException {
-        final String query = "1 castable as y";
-        final String error = "err:XPST0051 Unknown simple type y [at line 1, column 15]";
-        assertCompilationError(query, error);
-    }
-
-    private void assertCompilationError(final String query, final String error) throws XMLDBException {
-        final XQueryService service = (XQueryService)existEmbeddedServer.getRoot().getService("XQueryService", "1.0");
-
-        try {
-            service.compile(query);
-            fail("no XMLDBException was thrown during compilation.");
-        } catch (XMLDBException ex) {
-            assertEquals( error, ex.getMessage() );
-        }
+    public void castableAs() throws EXistException, PermissionDeniedException {
+        final String query = "1 castable as g";
+        final String error = "Unknown simple type g";
+        assertXQStaticError(ErrorCodes.XPST0051, 1, 15, error, compileQuery(query));
     }
 }