more cleanup

ArcadeData · Oct 23, 2024 · 36bb6fb · 36bb6fb
1 parent de95474
commit 36bb6fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 22 deletions.
diff --git a/engine/src/test/java/com/arcadedb/TypeConversionTest.java b/engine/src/test/java/com/arcadedb/TypeConversionTest.java
@@ -482,14 +482,12 @@ public void testSQLMath() {
     try {
       database.begin();
       final LocalDateTime date1 = LocalDateTime.now();
-      final LocalDateTime date2 = LocalDateTime.now().plusSeconds(1);
+      final LocalDateTime date2 = date1.plusSeconds(1);
 
       ResultSet resultSet = database.command("sql", "insert into ConversionTest set datetime_micros = ?", date1);
-      assertThat(resultSet.hasNext()).isTrue();
       assertThat(resultSet.next().toElement().get("datetime_micros")).isEqualTo(date1.truncatedTo(ChronoUnit.MICROS));
 
       resultSet = database.command("sql", "insert into ConversionTest set datetime_micros = ?", date2);
-      assertThat(resultSet.hasNext()).isTrue();
       assertThat(resultSet.next().toElement().get("datetime_micros")).isEqualTo(date2.truncatedTo(ChronoUnit.MICROS));
 
       resultSet = database.command("sql", "select from ConversionTest where datetime_micros between ? and ?", date1, date2);
@@ -509,11 +507,11 @@ public void testSQLMath() {
 
       assertThat(resultSet.hasNext()).isTrue();
       Result result = resultSet.next();
-      assertThat(((Duration) result.getProperty("diff")).isNegative()).as("Returned " + result.getProperty("diff")).isFalse();
+      assertThat(result.<Duration>getProperty("diff")).isPositive();
 
       assertThat(resultSet.hasNext()).isTrue();
       result = resultSet.next();
-      assertThat(((Duration) result.getProperty("diff")).isNegative()).as("Returned " + result.getProperty("diff")).isFalse();
+      assertThat(result.<Duration>getProperty("diff")).isPositive();
 
       assertThat(resultSet.hasNext()).isFalse();
 
@@ -525,11 +523,11 @@ where sysdate() - datetime_micros < duration(100000000000, 'nanosecond')
               """);
       assertThat(resultSet.hasNext()).isTrue();
       result = resultSet.next();
-      assertThat(((Duration) result.getProperty("diff")).isNegative()).as("Returned " + result.getProperty("diff")).isFalse();
+      assertThat(result.<Duration>getProperty("diff")).isPositive();
 
       assertThat(resultSet.hasNext()).isTrue();
       result = resultSet.next();
-      assertThat(((Duration) result.getProperty("diff")).isNegative()).as("Returned " + result.getProperty("diff")).isFalse();
+      assertThat(result.<Duration>getProperty("diff")).isPositive();
 
       assertThat(resultSet.hasNext()).isFalse();
 
@@ -542,11 +540,11 @@ where abs( datetime_micros - sysdate() ) < duration(100000000000, 'nanosecond')
 
       assertThat(resultSet.hasNext()).isTrue();
       result = resultSet.next();
-      assertThat(((Duration) result.getProperty("diff")).isNegative()).as("Returned " + result.getProperty("diff")).isTrue();
+      assertThat(result.<Duration>getProperty("diff")).isNegative();
 
       assertThat(resultSet.hasNext()).isTrue();
       result = resultSet.next();
-      assertThat(((Duration) result.getProperty("diff")).isNegative()).as("Returned " + result.getProperty("diff")).isTrue();
+      assertThat(result.<Duration>getProperty("diff")).isNegative();
 
       assertThat(resultSet.hasNext()).isFalse();
 
@@ -560,11 +558,11 @@ where abs( datetime_micros - sysdate() ) < duration(100000000000, 'nanosecond')
 
       assertThat(resultSet.hasNext()).isTrue();
       result = resultSet.next();
-      assertThat(((Duration) result.getProperty("diff")).isNegative()).as("Returned " + result.getProperty("diff")).isTrue();
+      assertThat(result.<Duration>getProperty("diff")).isNegative();
 
       assertThat(resultSet.hasNext()).isTrue();
       result = resultSet.next();
-      assertThat(((Duration) result.getProperty("diff")).isNegative()).as("Returned " + result.getProperty("diff")).isTrue();
+      assertThat(result.<Duration>getProperty("diff")).isNegative();
 
       assertThat(resultSet.hasNext()).isFalse();
 
@@ -578,11 +576,11 @@ where abs( datetime_micros - sysdate() ) < duration(3, "second")
 
       assertThat(resultSet.hasNext()).isTrue();
       result = resultSet.next();
-      assertThat(((Duration) result.getProperty("diff")).isNegative()).as("Returned " + result.getProperty("diff")).isTrue();
+      assertThat(result.<Duration>getProperty("diff")).isNegative();
 
       assertThat(resultSet.hasNext()).isTrue();
       result = resultSet.next();
-      assertThat(((Duration) result.getProperty("diff")).isNegative()).as("Returned " + result.getProperty("diff")).isTrue();
+      assertThat(result.<Duration>getProperty("diff")).isNegative();
 
       assertThat(resultSet.hasNext()).isFalse();
 

diff --git a/server/src/test/java/com/arcadedb/server/RemoteQueriesIT.java b/server/src/test/java/com/arcadedb/server/RemoteQueriesIT.java
@@ -139,9 +139,6 @@ public void testWhereEqualsAfterUpdate() {
       String sqlString = "UPDATE Order SET status = ? RETURN AFTER WHERE id = ?";
       try (ResultSet resultSet1 = database.command("sql", sqlString, parameters2)) {
           assertThat(resultSet1.next().<String>getProperty("id")).isEqualTo("1");
-      } catch (Exception e) {
-        System.out.println(e.getMessage());
-        e.printStackTrace();
       }
     });
 
@@ -153,9 +150,6 @@ public void testWhereEqualsAfterUpdate() {
       String sqlString = "SELECT id, processor, status FROM Order WHERE status = ?";
       try (ResultSet resultSet1 = database.query("sql", sqlString, parameters2)) {
         assertThat(resultSet1.next().<String>getProperty("status")).isEqualTo("PENDING");
-      } catch (Exception e) {
-        System.out.println(e.getMessage());
-        e.printStackTrace();
       }
     });
     // drop index
@@ -167,9 +161,6 @@ public void testWhereEqualsAfterUpdate() {
       String sqlString = "SELECT id, processor, status FROM Order WHERE status = ?";
       try (ResultSet resultSet1 = database.query("sql", sqlString, parameters2)) {
         assertThat(resultSet1.next().<String>getProperty("status")).isEqualTo("PENDING");
-      } catch (Exception e) {
-        System.out.println(e.getMessage());
-        e.printStackTrace();
       }
     });
   }