添加 测试案例

Author: linzhijun

java/toolgood.algorithm/src/main/java/toolgood/algorithm/Operand.java

@@ -47,7 +47,7 @@ public int IntValue() {
     public long LongValue() {
         return 0;
     }
-
+    public Object Value(){return  null;}
 
     public String TextValue() {
         return null;
@@ -292,10 +292,15 @@ else if (v.IsNull())
     }
 
     static abstract class OperandT<T> extends Operand {
-        public T Value;
+        protected T _value;
+
+        @Override
+        public Object Value() {
+            return _value;
+        }
 
         public OperandT(final T obj) {
-            Value = obj;
+            _value = obj;
         }
     }
 
@@ -311,7 +316,7 @@ public OperandType Type() {
 
         @Override
         public List<Operand> ArrayValue() {
-            return Value;
+            return _value;
         }
     }
 
@@ -327,7 +332,7 @@ public OperandType Type() {
 
         @Override
         public boolean BooleanValue() {
-            return Value;
+            return _value;
         }
     }
 
@@ -343,7 +348,7 @@ public OperandType Type() {
 
         @Override
         public MyDate DateValue() {
-            return Value;
+            return _value;
         }
     }
 
@@ -381,7 +386,7 @@ public OperandType Type() {
 
         @Override
         public JsonData JsonValue() {
-            return Value;
+            return _value;
         }
     }
 
@@ -414,22 +419,22 @@ public OperandType Type() {
 
         @Override
         public int IntValue() {
-            return Value.intValue();
+            return _value.intValue();
         }
 
         @Override
         public BigDecimal NumberValue() {
-            return Value;
+            return _value;
         }
 
         @Override
         public double DoubleValue() {
-            return Value.doubleValue();
+            return _value.doubleValue();
         }
 
         @Override
         public long LongValue(){
-            return Value.longValue();
+            return _value.longValue();
         }
     }
 
@@ -446,7 +451,7 @@ public OperandType Type() {
 
         @Override
         public String TextValue() {
-            return Value;
+            return _value;
         }
 
     }

java/toolgood.algorithm/src/test/java/toolgood/algorithm/Tests/AlgorithmEngineTest.java

@@ -8,6 +8,8 @@
 import org.junit.Test;
 
 import toolgood.algorithm.AlgorithmEngine;
+import toolgood.algorithm.Operand;
+import toolgood.algorithm.OperandType;
 
 public class AlgorithmEngineTest {
 
@@ -243,4 +245,13 @@ public void Test5555(){
 
     }
 
+    @Test
+    public void Year_test_withType() throws Exception {
+        AlgorithmEngine engine = new AlgorithmEngine();
+        engine.Parse("year(now())");
+        Operand operand = engine.Evaluate();
+        assertEquals(OperandType.NUMBER, operand.Type());
+        assertEquals(Long.valueOf(DateTime.now().getYear()).longValue(), operand.LongValue());
+    }
+
 }