test: refactor assertions to use assertThatThrownBy for exception handling (#2552)

Author: robfrank

engine/src/test/java/com/arcadedb/query/sql/executor/ScriptExecutionTest.java

@@ -29,12 +29,12 @@
 import com.arcadedb.exception.ConcurrentModificationException;
 import com.arcadedb.query.sql.SQLQueryEngine;
 import com.arcadedb.query.sql.function.SQLFunctionAbstract;
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
+  import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
  * @author Luigi Dell'Aquila (l.dellaquila-(at)-orientdatabase.com)
@@ -352,7 +352,7 @@ public void testCommitRetryWithFailure() {
           SELECT throwCME(#-1:-1, 1, 1, 1);
           COMMIT RETRY 10;
           """.formatted(typeName);
-      ;
+
       try {
         database.command("sqlscript", script);
       } catch (ConcurrentModificationException x) {
@@ -440,11 +440,8 @@ public void testCommitRetryWithFailureScriptAndFail() {
               } AND FAIL;
           """.formatted(typeName, typeName);
 
-      try {
-        database.command("sqlscript", script);
-        Assertions.fail();
-      } catch (ConcurrentModificationException e) {
-      }
+      assertThatThrownBy(() -> database.command("sqlscript", script))
+          .isInstanceOf(ConcurrentModificationException.class);
     });
 
     ResultSet result = database.query("sql", "select from " + typeName);
@@ -472,12 +469,8 @@ public void testCommitRetryWithFailureScriptAndFail2() {
               }
           """.formatted(typeName, typeName);
 
-      try {
-        database.command("sqlscript", script);
-        Assertions.fail();
-      } catch (ConcurrentModificationException e) {
-
-      }
+      assertThatThrownBy(() -> database.command("sqlscript", script))
+          .isInstanceOf(ConcurrentModificationException.class);
 
       ResultSet result = database.query("sql", "select from " + typeName);
       Result item = result.next();
@@ -489,14 +482,10 @@ public void testCommitRetryWithFailureScriptAndFail2() {
   @Test
   public void testFunctionAsStatement() {
     database.transaction(() -> {
-      String script = "";
-      script += "sqrt(64);";
+      String script = "sqrt(64);";
 
-      try {
-        database.command("sql", script);
-        Assertions.fail();
-      } catch (CommandSQLParsingException e) {
-      }
+      assertThatThrownBy(() -> database.command("sql", script))
+          .isInstanceOf(CommandSQLParsingException.class);
 
       ResultSet rs = database.command("sqlscript", script);
       Result item = rs.next();

engine/src/test/java/com/arcadedb/query/sql/parser/SQLGrammarErrorsTest.java

@@ -1,41 +1,37 @@
 package com.arcadedb.query.sql.parser;
 
 import com.arcadedb.exception.CommandSQLParsingException;
-import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
  * Simple test to verify improved SQL grammar error messages
  */
-public class SQLGrammarErrorsTest {
-  public static void main(String[] args) {
+class SQLGrammarErrorsTest {
+
+  @Test
+  void testSQLGrammarErrors() {
     StatementCache cache = new StatementCache(null, 100);
 
     // Test case 1: Duplicate AND operators
-    try {
-      cache.get("select from Chat where #22:1 IN $brain AND  and contextVariables['local:insuranceGrid'] = true");
-      Assertions.fail();
-    } catch (CommandSQLParsingException e) {
-      Assertions.assertTrue(e.getMessage().contains("AND operator") && e.getMessage().contains("must be followed by a condition"),
-          "Expected improved error message about AND operator, got: " + e.getMessage());
-    }
+    assertThatThrownBy(
+        () -> cache.get("select from Chat where #22:1 IN $brain AND  and contextVariables['local:insuranceGrid'] = true"))
+        .isInstanceOf(CommandSQLParsingException.class)
+        .hasMessageContaining("AND operator")
+        .hasMessageContaining("must be followed by a condition");
 
     // Test case 2: OR followed by AND
-    try {
-      cache.get("select from Chat where col = 1 OR AND col2 = 2");
-      Assertions.fail();
-    } catch (CommandSQLParsingException e) {
-      Assertions.assertTrue(e.getMessage().contains("OR operator") && e.getMessage().contains("must be followed by a condition"),
-          "Expected improved error message about OR operator, got: " + e.getMessage());
-    }
+    assertThatThrownBy(() -> cache.get("select from Chat where col = 1 OR AND col2 = 2"))
+        .isInstanceOf(CommandSQLParsingException.class)
+        .hasMessageContaining("OR operator")
+        .hasMessageContaining("must be followed by a condition");
 
     // Test case 3: Missing condition after AND
-    try {
-      cache.get("select from Chat where col = 1 AND");
-      Assertions.fail();
-    } catch (CommandSQLParsingException e) {
-      Assertions.assertTrue(e.getMessage().contains("AND operator") && e.getMessage().contains("must be followed by a condition"),
-          "Expected improved error message about AND operator, got: " + e.getMessage());
-    }
+    assertThatThrownBy(() -> cache.get("select from Chat where col = 1 AND"))
+        .isInstanceOf(CommandSQLParsingException.class)
+        .hasMessageContaining("AND operator")
+        .hasMessageContaining("must be followed by a condition");
 
     // Test case 4: Valid query should work
     cache.get("select from Chat where col = 1 AND col2 = 2");

engine/src/test/java/com/arcadedb/schema/DictionaryTest.java

@@ -25,14 +25,12 @@
 import com.arcadedb.graph.MutableVertex;
 import com.arcadedb.graph.Vertex;
 import com.arcadedb.query.sql.executor.ResultSet;
-
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.util.Iterator;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class DictionaryTest extends TestHelper {
   @Test
@@ -99,14 +97,10 @@ public void updateName() {
       assertThat(i).isEqualTo(11);
     });
 
-    try {
-      database.transaction(() -> {
-        assertThat(database.getSchema().existsType("V")).isTrue();
-        database.getSchema().getDictionary().updateName("V", "V2");
-      });
-      fail("");
-    } catch (final Exception e) {
-    }
+    assertThatThrownBy(() -> database.transaction(() -> {
+      assertThat(database.getSchema().existsType("V")).isTrue();
+      database.getSchema().getDictionary().updateName("V", "V2");
+    })).isInstanceOf(Exception.class);
   }
 
   @Test

engine/src/test/java/com/arcadedb/schema/DocumentValidationTest.java

@@ -29,14 +29,18 @@
 import com.arcadedb.graph.MutableVertex;
 import com.arcadedb.query.sql.executor.Result;
 import com.arcadedb.query.sql.executor.ResultSet;
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.text.*;
-import java.util.*;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 public class DocumentValidationTest extends TestHelper {
 
@@ -279,12 +283,8 @@ public void testRequiredValidationEdge() {
     database.transaction(() -> {
       final MutableVertex v1 = database.newVertex("V").save();
       final MutableVertex v2 = database.newVertex("V").save();
-      try {
-        v1.newEdge("E", v2);
-        Assertions.fail();
-      } catch (ValidationException e) {
-        // EXPECTED
-      }
+      assertThatThrownBy(() -> v1.newEdge("E", v2))
+          .isInstanceOf(ValidationException.class);
 
       final MutableEdge e = v1.newEdge("E", v2, "id", "12345");
       assertThat(e.getString("id")).isEqualTo("12345");
@@ -303,26 +303,14 @@ public void testRequiredValidationEdgeSQL() {
     database.transaction(() -> {
       final MutableVertex v1 = database.newVertex("V").save();
       final MutableVertex v2 = database.newVertex("V").save();
-      try {
-        database.command("sql", "create edge E from ? to ?", v1, v2);
-        Assertions.fail();
-      } catch (ValidationException e) {
-        // EXPECTED
-      }
-
-      try {
-        database.command("sql", "create edge E from ? to ? set a = '12345'", v1, v2);
-        Assertions.fail();
-      } catch (ValidationException e) {
-        // EXPECTED
-      }
-
-      try {
-        database.command("sql", "create edge E from ? to ? set a = '12345', b = '4444'", v1, v2);
-        Assertions.fail();
-      } catch (ValidationException e) {
-        // EXPECTED
-      }
+      assertThatThrownBy(() -> database.command("sql", "create edge E from ? to ?", v1, v2))
+          .isInstanceOf(ValidationException.class);
+
+      assertThatThrownBy(() -> database.command("sql", "create edge E from ? to ? set a = '12345'", v1, v2))
+          .isInstanceOf(ValidationException.class);
+
+      assertThatThrownBy(() -> database.command("sql", "create edge E from ? to ? set a = '12345', b = '4444'", v1, v2))
+          .isInstanceOf(ValidationException.class);
 
       final Edge e = database.command("sql", "create edge E from ? to ? set a = '12345', b = '4444', c = '2222'", v1, v2)
           .nextIfAvailable().getEdge().get();
@@ -348,12 +336,9 @@ public void testValidationNotValidEmbedded() {
 
     final MutableDocument embedded = d.newEmbeddedDocument("EmbeddedValidation", "embedded");
     embedded.set("test", "test");
-    try {
-      d.validate();
-      fail("Validation doesn't throw exception");
-    } catch (final ValidationException e) {
-      assertThat(e.toString().contains("int")).isTrue();
-    }
+    assertThatThrownBy(() -> d.validate())
+        .isInstanceOf(ValidationException.class)
+        .hasMessageContaining("int");
   }
 
   @Test
@@ -381,12 +366,9 @@ public void testValidationNotValidEmbeddedList() {
     final MutableDocument embeddedInList2 = d.newEmbeddedDocument("EmbeddedValidation", "embeddedList");
     embeddedInList2.set("int", 30);
 
-    try {
-      d.validate();
-      fail("Validation doesn't throw exception");
-    } catch (final ValidationException e) {
-      assertThat(e.toString().contains("long")).isTrue();
-    }
+    assertThatThrownBy(() -> d.validate())
+        .isInstanceOf(ValidationException.class)
+        .hasMessageContaining("long");
   }
 
   @Test
@@ -415,12 +397,9 @@ public void testValidationNotValidEmbeddedMap() {
     embeddedInMap2.set("int", 30);
     embeddedMap.put("2", embeddedInMap2);
 
-    try {
-      d.validate();
-      fail("Validation doesn't throw exception");
-    } catch (final ValidationException e) {
-      assertThat(e.toString().contains("long")).isTrue();
-    }
+    assertThatThrownBy(() -> d.validate())
+        .isInstanceOf(ValidationException.class)
+        .hasMessageContaining("long");
   }
 
   @Test
@@ -736,19 +715,11 @@ public void testPropertyMetadataAreSavedAndReloadded() {
   @Test
   public void testMinMaxNotApplicable() {
     final DocumentType clazz = database.getSchema().getOrCreateDocumentType("Validation");
-    try {
-      clazz.createProperty("invString", Type.STRING).setMin("-1");
-      fail("");
-    } catch (IllegalArgumentException e) {
-      // EXPECTED
-    }
-
-    try {
-      clazz.createProperty("invBinary", Type.LIST).setMax("-1");
-      fail("");
-    } catch (IllegalArgumentException e) {
-      // EXPECTED
-    }
+    assertThatThrownBy(() -> clazz.createProperty("invString", Type.STRING).setMin("-1"))
+        .isInstanceOf(IllegalArgumentException.class);
+
+    assertThatThrownBy(() -> clazz.createProperty("invBinary", Type.LIST).setMax("-1"))
+        .isInstanceOf(IllegalArgumentException.class);
   }
 
   @Test
@@ -762,31 +733,25 @@ public void testEmbeddedDocumentConversion() {
   }
 
   private void checkFieldValue(final Document toCheck, final String field, final Object newValue) {
-    try {
+    assertThatThrownBy(() -> {
       final MutableDocument newD = database.newDocument(toCheck.getTypeName()).fromMap(toCheck.toMap());
       newD.set(field, newValue);
       newD.validate();
-      fail("");
-    } catch (final ValidationException v) {
-    }
+    }).isInstanceOf(ValidationException.class);
   }
 
   private void checkRequireField(final MutableDocument toCheck, final String fieldName) {
-    try {
+    assertThatThrownBy(() -> {
       final MutableDocument newD = database.newDocument(toCheck.getTypeName()).fromMap(toCheck.toMap());
       newD.remove(fieldName);
       newD.validate();
-      fail("");
-    } catch (final ValidationException v) {
-    }
+    }).isInstanceOf(ValidationException.class);
   }
 
   private void checkReadOnlyField(final MutableDocument toCheck, final String fieldName) {
-    try {
+    assertThatThrownBy(() -> {
       toCheck.remove(fieldName);
       toCheck.validate();
-      fail("");
-    } catch (final ValidationException v) {
-    }
+    }).isInstanceOf(ValidationException.class);
   }
 }

engine/src/test/java/com/arcadedb/schema/DropTypeTest.java

@@ -23,7 +23,6 @@
 import com.arcadedb.engine.Bucket;
 import com.arcadedb.exception.SchemaException;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.util.*;
@@ -72,23 +71,14 @@ public void testDropAndRecreateType() {
 
       // CHECK ALL THE BUCKETS ARE REMOVED
       for (final Bucket b : buckets) {
-        try {
-          database.getSchema().getBucketById(b.getFileId());
-          fail();
-        } catch (final SchemaException e) {
-        }
-
-        try {
-          database.getSchema().getBucketByName(b.getName());
-          fail();
-        } catch (final SchemaException e) {
-        }
-
-        try {
-          database.getSchema().getFileById(b.getFileId());
-          fail();
-        } catch (final SchemaException e) {
-        }
+        assertThatThrownBy(() -> database.getSchema().getBucketById(b.getFileId()))
+            .isInstanceOf(SchemaException.class);
+
+        assertThatThrownBy(() -> database.getSchema().getBucketByName(b.getName()))
+            .isInstanceOf(SchemaException.class);
+
+        assertThatThrownBy(() -> database.getSchema().getFileById(b.getFileId()))
+            .isInstanceOf(SchemaException.class);
       }
 
       // CHECK TYPE HAS BEEN REMOVED FROM INHERITANCE