remove mvel test under java 21

alibaba · Oct 11, 2023 · b6779f2 · b6779f2
1 parent 071fb40
commit b6779f2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/jetcache-test/src/main/java/com/alicp/jetcache/test/beans/TestBean.java b/jetcache-test/src/main/java/com/alicp/jetcache/test/beans/TestBean.java
@@ -88,22 +88,22 @@ public int countLocalWithDynamicQueryWithEquals(DynamicQueryWithEquals q) {
         return count++;
     }
 
-    @Cached(condition = "mvel{bean('configBean').trueProp}")
+    @Cached(condition = "bean('configBean').trueProp")
     public int countEnabledWithConfigBean(){
         return count++;
     }
 
-    @Cached(condition = "mvel{bean('configBean').falseProp}")
+    @Cached(condition = "bean('configBean').falseProp")
     public int countDisabledWithConfigBean(){
         return count++;
     }
 
-    @Cached(condition = "mvel{xxx('configBean').trueProp}")
+    @Cached(condition = "xxx('configBean').trueProp")
     public int countWithWrongCondition(){
         return count++;
     }
 
-    @Cached(condition = "mvel{args[0]}")
+    @Cached(condition = "args[0]")
     public int count(boolean useCache){
         return count++;
     }

diff --git a/jetcache-test/src/test/java/com/alicp/jetcache/anno/method/CacheHandlerTest.java b/jetcache-test/src/test/java/com/alicp/jetcache/anno/method/CacheHandlerTest.java
@@ -216,7 +216,7 @@ public void testStaticInvokeCondition() throws Throwable {
         Method method = CountClass.class.getMethod("count", int.class);
         cachedAnnoConfig.setDefineMethod(method);
         int x1, x2;
-        cachedAnnoConfig.setCondition("mvel{args[0]>10}");
+        cachedAnnoConfig.setCondition("args[0]>10");
         x1 = invokeQuery(method, new Object[]{10});
         x2 = invokeQuery(method, new Object[]{10});
         assertNotEquals(x1, x2);
@@ -230,7 +230,7 @@ public void testStaticInvokePostCondition() throws Throwable {
         Method method = CountClass.class.getMethod("count");
         cachedAnnoConfig.setDefineMethod(method);
         int x1, x2, x3;
-        cachedAnnoConfig.setPostCondition("mvel{result%2==1}");
+        cachedAnnoConfig.setPostCondition("result%2==1");
         cacheInvokeConfig.getCachedAnnoConfig().setPostConditionEvaluator(null);
         x1 = invokeQuery(method, null);//return 0, postCondition=false, so not cached
         x2 = invokeQuery(method, null);//return 1, postCondition=true, so cached

diff --git a/jetcache-test/src/test/java/com/alicp/jetcache/anno/method/ExpressionUtilTest.java b/jetcache-test/src/test/java/com/alicp/jetcache/anno/method/ExpressionUtilTest.java
@@ -38,14 +38,14 @@ public void setup() throws Exception {
 
     @Test
     public void testCondition1() {
-        cachedAnnoConfig.setCondition("mvel{args[0]==null}");
+        cachedAnnoConfig.setCondition("args[0]==null");
         assertFalse(ExpressionUtil.evalCondition(context, cachedAnnoConfig));
         context.setArgs(new Object[2]);
         assertTrue(ExpressionUtil.evalCondition(context, cachedAnnoConfig));
     }
     @Test
     public void testCondition2() {
-        cachedAnnoConfig.setCondition("mvel{args[0].length()==4}");
+        cachedAnnoConfig.setCondition("args[0].length()==4");
         context.setArgs(new Object[]{"1234", 5678});
         assertTrue(ExpressionUtil.evalCondition(context, cachedAnnoConfig));
     }

diff --git a/jetcache-test/src/test/java/com/alicp/jetcache/anno/method/MvelEvaluatorTest.java b/jetcache-test/src/test/java/com/alicp/jetcache/anno/method/MvelEvaluatorTest.java
@@ -4,6 +4,8 @@
 package com.alicp.jetcache.anno.method;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -12,6 +14,7 @@
  */
 public class MvelEvaluatorTest {
     @Test
+    @DisabledForJreRange(min = JRE.JAVA_21, disabledReason = "mvel not work on java 21 now")
     public void test() {
         MvelEvaluator e = new MvelEvaluator("bean('a')");
         assertEquals("a_bean", e.apply(new RootObject()));