refactor: reduced usage of legacy query engine in tests

orientechnologies · Oct 15, 2024 · 78764a1 · 78764a1
1 parent 0b353b9
commit 78764a1
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 79 deletions.
diff --git a/core/src/test/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLSelectTest.java b/core/src/test/java/com/orientechnologies/orient/core/sql/OCommandExecutorSQLSelectTest.java
@@ -959,31 +959,24 @@ public void testAggregations() {
 
   @Test
   public void testLetOrder() {
-    OSQLSynchQuery sql =
-        new OSQLSynchQuery(
-            "SELECT"
-                + "      source,"
-                + "  $maxYear as maxYear"
-                + "              FROM"
-                + "      ("
-                + "          SELECT expand( $union ) "
-                + "  LET"
-                + "      $a = (SELECT 'A' as source, 2013 as year),"
-                + "  $b = (SELECT 'B' as source, 2012 as year),"
-                + "  $union = unionAll($a,$b) "
-                + "  ) "
-                + "  LET "
-                + "      $maxYear = max(year)"
-                + "  GROUP BY"
-                + "  source");
-    try {
-      List<ODocument> results = db.query(sql);
-      fail(
-          "Invalid query, usage of LET, aggregate functions and GROUP BY together is not"
-              + " supported");
-    } catch (OCommandSQLParsingException x) {
-
-    }
+    String sql =
+        "SELECT"
+            + "      source,"
+            + "  $maxYear as maxYear"
+            + "              FROM"
+            + "      ("
+            + "          SELECT expand( $union ) "
+            + "  LET"
+            + "      $a = (SELECT 'A' as source, 2013 as year),"
+            + "  $b = (SELECT 'B' as source, 2012 as year),"
+            + "  $union = unionAll($a,$b) "
+            + "  ) "
+            + "  LET "
+            + "      $maxYear = max(year)"
+            + "  GROUP BY"
+            + "  source";
+    List results = db.query(sql).stream().toList();
+    assertEquals(results.size(), 2);
   }
 
   @Test

diff --git a/...est/java/com/orientechnologies/orient/core/sql/executor/OMatchStatementExecutionTest.java b/...est/java/com/orientechnologies/orient/core/sql/executor/OMatchStatementExecutionTest.java
@@ -1713,26 +1713,25 @@ public void testCircularDependency() {
     // - far depends on baz
     // - baz depends on bar
     // - bar depends on far
-    OSQLSynchQuery query =
-        new OSQLSynchQuery(
-            "MATCH {\n"
-                + "    class: testCircularDependency_Foo,\n"
-                + "    as: foo\n"
-                + "}.out('testCircularDependency_Foo_Far') {\n"
-                + "    where: ($matched.baz IS NOT null),\n"
-                + "    as: far\n"
-                + "}, {\n"
-                + "    as: foo\n"
-                + "}.out('testCircularDependency_Foo_Bar') {\n"
-                + "    where: ($matched.far IS NOT null),\n"
-                + "    as: bar\n"
-                + "}.out('testCircularDependency_Bar_Baz') {\n"
-                + "    where: ($matched.bar IS NOT null),\n"
-                + "    as: baz\n"
-                + "} RETURN $matches");
+    String query =
+        "MATCH {\n"
+            + "    class: testCircularDependency_Foo,\n"
+            + "    as: foo\n"
+            + "}.out('testCircularDependency_Foo_Far') {\n"
+            + "    where: ($matched.baz IS NOT null),\n"
+            + "    as: far\n"
+            + "}, {\n"
+            + "    as: foo\n"
+            + "}.out('testCircularDependency_Foo_Bar') {\n"
+            + "    where: ($matched.far IS NOT null),\n"
+            + "    as: bar\n"
+            + "}.out('testCircularDependency_Bar_Baz') {\n"
+            + "    where: ($matched.bar IS NOT null),\n"
+            + "    as: baz\n"
+            + "} RETURN $matches";
 
     try {
-      db.query(query);
+      db.query(query).next();
       fail();
     } catch (OCommandExecutionException x) {
       // passed the test
@@ -1756,18 +1755,16 @@ public void testUndefinedAliasDependency() {
         .close();
 
     // "bar" in the following query declares a dependency on the alias "baz", which doesn't exist.
-    OSQLSynchQuery query =
-        new OSQLSynchQuery(
-            "MATCH {\n"
-                + "    class: testUndefinedAliasDependency_Foo,\n"
-                + "    as: foo\n"
-                + "}.out('testUndefinedAliasDependency_Foo_Bar') {\n"
-                + "    where: ($matched.baz IS NOT null),\n"
-                + "    as: bar\n"
-                + "} RETURN $matches");
-
+    String query =
+        "MATCH {\n"
+            + "    class: testUndefinedAliasDependency_Foo,\n"
+            + "    as: foo\n"
+            + "}.out('testUndefinedAliasDependency_Foo_Bar') {\n"
+            + "    where: ($matched.baz IS NOT null),\n"
+            + "    as: bar\n"
+            + "} RETURN $matches";
     try {
-      db.query(query);
+      db.query(query).next();
       fail();
     } catch (OCommandExecutionException x) {
       // passed the test

diff --git a/...est/java/com/orientechnologies/orient/core/sql/functions/sql/OCustomSQLFunctionsTest.java b/...est/java/com/orientechnologies/orient/core/sql/functions/sql/OCustomSQLFunctionsTest.java
@@ -5,9 +5,7 @@
 
 import com.orientechnologies.BaseMemoryDatabase;
 import com.orientechnologies.orient.core.exception.OQueryParsingException;
-import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.core.sql.executor.OResultSet;
-import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery;
 import org.junit.Test;
 
 public class OCustomSQLFunctionsTest extends BaseMemoryDatabase {
@@ -43,7 +41,8 @@ public void testAbsFloat() {
   }
 
   @Test(expected = OQueryParsingException.class)
-  public void testNonExistingFunction() {
-    db.query(new OSQLSynchQuery<ODocument>("select math_min('boom', 'boom') as boom"));
+  public void tresutestNonExistingFunction() {
+    OResultSet resut = db.query("select math_min('boom', 'boom') as boom");
+    resut.next();
   }
 }
diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/JSONStreamTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/JSONStreamTest.java
@@ -383,11 +383,10 @@ public void testFetchedJson() throws IOException {
 
       final List<ODocument> result =
           database
-              .getUnderlying()
-              .command(
-                  new OSQLSynchQuery<ODocument>(
-                      "select * from Profile where name = 'Barack' and surname = 'Obama'"))
-              .execute();
+              .command("select * from Profile where name = 'Barack' and surname = 'Obama'")
+              .stream()
+              .map(x -> (ODocument) x.toElement())
+              .toList();
 
       for (final ODocument doc : result) {
         final String jsonFull =

diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/MultipleDBTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/MultipleDBTest.java
@@ -21,7 +21,7 @@
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.id.ORID;
 import com.orientechnologies.orient.core.record.impl.ODocument;
-import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery;
+import com.orientechnologies.orient.core.sql.executor.OResult;
 import com.orientechnologies.orient.object.db.OObjectDatabaseTx;
 import java.io.IOException;
 import java.util.Collections;
@@ -128,8 +128,7 @@ public Void call() throws InterruptedException, IOException {
 
                 start = System.currentTimeMillis();
                 for (int j = 0; j < operations_read; j++) {
-                  List<DummyObject> l =
-                      tx.query(new OSQLSynchQuery<DummyObject>(" select * from DummyObject "));
+                  List<OResult> l = tx.query(" select * from DummyObject ").stream().toList();
                   Assert.assertEquals(l.size(), operations_write);
 
                   // if ((j + 1) % 20000 == 0) {
@@ -246,8 +245,7 @@ public Void call() throws InterruptedException, IOException {
 
                 start = System.currentTimeMillis();
                 for (int j = 0; j < operations_read; j++) {
-                  List<DummyObject> l =
-                      tx.query(new OSQLSynchQuery<DummyObject>(" select * from DummyObject "));
+                  List<OResult> l = tx.query(" select * from DummyObject ").stream().toList();
                   Assert.assertEquals(l.size(), operations_write);
 
                   // if ((j + 1) % 20000 == 0) {

diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/SQLFunctionsTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/SQLFunctionsTest.java
@@ -32,7 +32,6 @@
 import com.orientechnologies.orient.core.sql.executor.OResult;
 import com.orientechnologies.orient.core.sql.executor.OResultSet;
 import com.orientechnologies.orient.core.sql.functions.OSQLFunctionAbstract;
-import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery;
 import java.io.UnsupportedEncodingException;
 import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
@@ -459,9 +458,7 @@ public void queryDate() {
 
   @Test(expectedExceptions = OCommandSQLParsingException.class)
   public void queryUndefinedFunction() {
-    database
-        .command(new OSQLSynchQuery<ODocument>("select blaaaa(salary) as max from Account"))
-        .execute();
+    database.command("select blaaaa(salary) as max from Account").next();
   }
 
   @Test

diff --git a/tests/src/test/java/com/orientechnologies/orient/test/database/auto/SQLMetadataTest.java b/tests/src/test/java/com/orientechnologies/orient/test/database/auto/SQLMetadataTest.java
@@ -15,10 +15,10 @@
  */
 package com.orientechnologies.orient.test.database.auto;
 
-import com.orientechnologies.orient.core.exception.OQueryParsingException;
-import com.orientechnologies.orient.core.record.impl.ODocument;
+import static org.junit.Assert.assertTrue;
+
+import com.orientechnologies.orient.core.exception.OStorageException;
 import com.orientechnologies.orient.core.sql.executor.OResult;
-import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery;
 import java.util.List;
 import org.testng.Assert;
 import org.testng.annotations.Optional;
@@ -65,11 +65,11 @@ public void queryIndexes() {
   @Test
   public void queryMetadataNotSupported() {
     try {
-      database
-          .command(new OSQLSynchQuery<ODocument>("select expand(indexes) from metadata:blaaa"))
-          .execute();
+      database.command("select expand(indexes) from metadata:blaaa").next();
       Assert.fail();
-    } catch (OQueryParsingException e) {
+    } catch (UnsupportedOperationException e) {
+    } catch (OStorageException e) {
+      assertTrue(e.getCause() instanceof UnsupportedOperationException);
     }
   }
 }