Add tests

nadment · Jan 15, 2025 · f4422f7 · f4422f7
1 parent d4336e6
commit f4422f7
Show file tree

Hide file tree

Showing 14 changed files with 85 additions and 114 deletions.
diff --git a/src/main/java/org/apache/hop/expression/operator/EndsWithFunction.java b/src/main/java/org/apache/hop/expression/operator/EndsWithFunction.java
@@ -65,10 +65,6 @@ public IExpression compile(IExpressionContext context, Call call) throws Express
   private static final class StringEndsWithFunction extends EndsWithFunction {
     public static final StringEndsWithFunction INSTANCE = new StringEndsWithFunction();
 
-    private StringEndsWithFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       String value = operands[0].getValue(String.class);
@@ -87,10 +83,6 @@ public Object eval(final IExpression[] operands) {
   private static final class BinaryEndsWithFunction extends EndsWithFunction {
     public static final BinaryEndsWithFunction INSTANCE = new BinaryEndsWithFunction();
 
-    private BinaryEndsWithFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       byte[] value = operands[0].getValue(byte[].class);

diff --git a/src/main/java/org/apache/hop/expression/operator/ReverseFunction.java b/src/main/java/org/apache/hop/expression/operator/ReverseFunction.java
@@ -58,10 +58,6 @@ public IExpression compile(IExpressionContext context, Call call) throws Express
   private static final class StringReverseFunction extends ReverseFunction {
     public static final ReverseFunction INSTANCE = new StringReverseFunction();
 
-    private StringReverseFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       String value = operands[0].getValue(String.class);
@@ -76,10 +72,6 @@ public Object eval(final IExpression[] operands) {
   private static final class BinaryReverseFunction extends ReverseFunction {
     public static final ReverseFunction INSTANCE = new BinaryReverseFunction();
 
-    private BinaryReverseFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       final byte[] value = operands[0].getValue(byte[].class);

diff --git a/src/main/java/org/apache/hop/expression/operator/RightFunction.java b/src/main/java/org/apache/hop/expression/operator/RightFunction.java
@@ -59,10 +59,6 @@ public IExpression compile(IExpressionContext context, Call call) throws Express
   private static final class StringRightFunction extends RightFunction {
     public static final RightFunction INSTANCE = new StringRightFunction();
 
-    private StringRightFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       String str = operands[0].getValue(String.class);
@@ -86,10 +82,6 @@ public Object eval(final IExpression[] operands) {
   private static final class BinaryRightFunction extends RightFunction {
     public static final RightFunction INSTANCE = new BinaryRightFunction();
 
-    private BinaryRightFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       byte[] bytes = operands[0].getValue(byte[].class);

diff --git a/src/main/java/org/apache/hop/expression/operator/ToBooleanFunction.java b/src/main/java/org/apache/hop/expression/operator/ToBooleanFunction.java
@@ -66,10 +66,6 @@ public IExpression compile(final IExpressionContext context, final Call call)
   private static final class StringToBooleanFunction extends ToBooleanFunction {
     private static final StringToBooleanFunction INSTANCE = new StringToBooleanFunction();
 
-    private StringToBooleanFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       String value = operands[0].getValue(String.class);
@@ -80,10 +76,6 @@ public Object eval(final IExpression[] operands) {
   private static final class IntegerToBooleanFunction extends ToBooleanFunction {
     private static final IntegerToBooleanFunction INSTANCE = new IntegerToBooleanFunction();
 
-    private IntegerToBooleanFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       Long value = operands[0].getValue(Long.class);
@@ -94,10 +86,6 @@ public Object eval(final IExpression[] operands) {
   private static final class NumberToBooleanFunction extends ToBooleanFunction {
     private static final NumberToBooleanFunction INSTANCE = new NumberToBooleanFunction();
 
-    private NumberToBooleanFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       BigDecimal value = operands[0].getValue(BigDecimal.class);

diff --git a/src/main/java/org/apache/hop/expression/operator/ToCharFunction.java b/src/main/java/org/apache/hop/expression/operator/ToCharFunction.java
@@ -164,10 +164,6 @@ public Object eval(final IExpression[] operands) {
   private static final class BooleanToCharFunction extends ToCharFunction {
     private static final ToCharFunction INSTANCE = new BooleanToCharFunction();
 
-    public BooleanToCharFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       Boolean value = operands[0].getValue(Boolean.class);

diff --git a/src/main/java/org/apache/hop/expression/operator/ToDateFunction.java b/src/main/java/org/apache/hop/expression/operator/ToDateFunction.java
@@ -91,10 +91,6 @@ public Object eval(final IExpression[] operands) {
   private static final class IntegerToDateFunction extends ToDateFunction {
     private static final IntegerToDateFunction INSTANCE = new IntegerToDateFunction();
 
-    private IntegerToDateFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       Long value = operands[0].getValue(Long.class);
@@ -106,10 +102,6 @@ public Object eval(final IExpression[] operands) {
   private static final class NumberToDateFunction extends ToDateFunction {
     private static final ToDateFunction INSTANCE = new NumberToDateFunction();
 
-    private NumberToDateFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       BigDecimal value = operands[0].getValue(BigDecimal.class);

diff --git a/src/main/java/org/apache/hop/expression/operator/TryToBinaryFunction.java b/src/main/java/org/apache/hop/expression/operator/TryToBinaryFunction.java
@@ -38,10 +38,6 @@ public class TryToBinaryFunction extends Function {
   private static final class StringHexTryToBinaryFunction extends TryToBinaryFunction {
     private static final TryToBinaryFunction INSTANCE = new StringHexTryToBinaryFunction();
 
-    private StringHexTryToBinaryFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       final String value = operands[0].getValue(String.class);
@@ -60,10 +56,6 @@ private static final class StringUtf8TryToBinaryFunction extends TryToBinaryFunc
 
     private static final TryToBinaryFunction INSTANCE = new StringUtf8TryToBinaryFunction();
 
-    private StringUtf8TryToBinaryFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       final String value = operands[0].getValue(String.class);
@@ -81,10 +73,6 @@ public Object eval(final IExpression[] operands) {
   private static final class StringBase64TryToBinaryFunction extends TryToBinaryFunction {
     private static final TryToBinaryFunction INSTANCE = new StringBase64TryToBinaryFunction();
 
-    private StringBase64TryToBinaryFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       final String value = operands[0].getValue(String.class);

diff --git a/src/main/java/org/apache/hop/expression/operator/TryToBooleanFunction.java b/src/main/java/org/apache/hop/expression/operator/TryToBooleanFunction.java
@@ -63,10 +63,6 @@ public IExpression compile(final IExpressionContext context, final Call call)
   private static final class StringTryToBooleanFunction extends TryToBooleanFunction {
     private static final StringTryToBooleanFunction INSTANCE = new StringTryToBooleanFunction();
 
-    private StringTryToBooleanFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       String value = operands[0].getValue(String.class);
@@ -81,10 +77,6 @@ public Object eval(final IExpression[] operands) {
   private static final class IntegerTryToBooleanFunction extends TryToBooleanFunction {
     private static final IntegerTryToBooleanFunction INSTANCE = new IntegerTryToBooleanFunction();
 
-    private IntegerTryToBooleanFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       Long value = operands[0].getValue(Long.class);
@@ -95,10 +87,6 @@ public Object eval(final IExpression[] operands) {
   private static final class NumberTryToBooleanFunction extends TryToBooleanFunction {
     private static final NumberTryToBooleanFunction INSTANCE = new NumberTryToBooleanFunction();
 
-    private NumberTryToBooleanFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       BigDecimal value = operands[0].getValue(BigDecimal.class);

diff --git a/src/main/java/org/apache/hop/expression/operator/TryToDateFunction.java b/src/main/java/org/apache/hop/expression/operator/TryToDateFunction.java
@@ -95,10 +95,6 @@ public Object eval(final IExpression[] operands) {
   private static final class IntegerTryToDateFunction extends TryToDateFunction {
     private static final TryToDateFunction INSTANCE = new IntegerTryToDateFunction();
 
-    private IntegerTryToDateFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       Long value = operands[0].getValue(Long.class);
@@ -109,10 +105,6 @@ public Object eval(final IExpression[] operands) {
   private static final class NumberTryToDateFunction extends TryToDateFunction {
     private static final TryToDateFunction INSTANCE = new NumberTryToDateFunction();
 
-    private NumberTryToDateFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       BigDecimal value = operands[0].getValue(BigDecimal.class);

diff --git a/src/main/java/org/apache/hop/expression/operator/TryToNumberFunction.java b/src/main/java/org/apache/hop/expression/operator/TryToNumberFunction.java
@@ -90,10 +90,6 @@ public Object eval(final IExpression[] operands) {
   private static final class DateTryToNumberFunction extends TryToNumberFunction {
     private static final TryToNumberFunction INSTANCE = new DateTryToNumberFunction();
 
-    private DateTryToNumberFunction() {
-      super();
-    }
-
     @Override
     public Object eval(final IExpression[] operands) {
       ZonedDateTime value = operands[0].getValue(ZonedDateTime.class);

diff --git a/src/main/java/org/apache/hop/expression/type/BinaryType.java b/src/main/java/org/apache/hop/expression/type/BinaryType.java
@@ -94,7 +94,6 @@ public byte[] cast(final Object value, String pattern) throws ConversionExceptio
     if (value == null) {
       return null;
     }
-
     if (value instanceof byte[] bytes) {
       return bytes;
     }
@@ -109,7 +108,14 @@ public byte[] cast(final Object value, String pattern) throws ConversionExceptio
   @Override
   public boolean compareEqual(Object left, Object right) {
     if (left instanceof byte[] l && right instanceof byte[] r) {
-      return equalsTo(l, r);
+      if (l.length != r.length) return false;
+      for (int i = 0; i < l.length; i++) {
+        int compare = l[i] - r[i];
+        if (compare != 0) {
+          return false;
+        }
+      }
+      return true;
     }
     return super.compareEqual(left, right);
   }
@@ -121,17 +127,4 @@ public int compare(Object left, Object right) {
     }
     return super.compare(left, right);
   }
-
-  protected static boolean equalsTo(final byte[] left, final byte[] right) {
-
-    if (left.length != right.length) return false;
-
-    for (int i = 0; i < left.length; i++) {
-      int compare = left[i] - right[i];
-      if (compare != 0) {
-        return false;
-      }
-    }
-    return true;
-  }
 }
diff --git a/src/main/java/org/apache/hop/expression/type/BooleanType.java b/src/main/java/org/apache/hop/expression/type/BooleanType.java
@@ -47,7 +47,9 @@ public TypeComparability getComparability() {
   @Override
   public <T> T convert(final Object value, final Class<T> clazz) throws ConversionException {
 
-    if (value == null) return null;
+    if (value == null) {
+      return null;
+    }
     if (clazz.isInstance(value)) {
       return clazz.cast(value);
     }

diff --git a/src/test/java/org/apache/hop/expression/OperatorTest.java b/src/test/java/org/apache/hop/expression/OperatorTest.java
@@ -42,6 +42,9 @@ void ElementAt() throws Exception {
 
     evalFails("[1,3,5][0]", ErrorCode.INVALID_ARRAY_INDEX);
     evalFails("[1,3,5][9]", ErrorCode.INVALID_ARRAY_INDEX);
+
+    optimize("[FIELD_INTEGER,3,5][1]");
+    optimize("[FIELD_STRING,'A','B'][1]");
   }
 
   @Test
@@ -1487,12 +1490,14 @@ void AtTimeZone() throws Exception {
         "(TIMESTAMP '2023-05-25 10:48:00' AT TIME ZONE 'UTC') AT TIME ZONE 'Asia/Singapore'",
         ZonedDateTime.of(2023, 5, 25, 10, 48, 00, 0, ZoneId.of("Asia/Singapore")));
 
+    evalNull("NULL_DATE AT TIME ZONE 'CET'");
+
     evalFails("TIMESTAMP '2023-05-25 20:48:00' AT TIME ZONE 'XYZ'", ErrorCode.INVALID_TIMEZONE);
     evalFails("TIMESTAMP '2023-05-25 20:48:00' AT TIME 'Europe/Paris'", ErrorCode.SYNTAX_ERROR);
     evalFails("TIMESTAMP '2023-05-25 20:48:00' AT TIME ZONE", ErrorCode.SYNTAX_ERROR);
     evalFails("TIMESTAMP '2023-05-25 20:48:00' AT ZONE 'Europe/Paris'", ErrorCode.SYNTAX_ERROR);
 
-    optimize("TIMESTAMP '2023-05-25 20:48:00' AT TIME ZONE 'Europe/Paris'");
+    optimize("FIELD_DATE AT TIME ZONE 'Europe/Paris'");
   }
 
   @Test