Browse Source

修复test error

zhou-hao 7 years ago
parent
commit
3eb141a08c

+ 2 - 1
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/DataType.java

@@ -9,7 +9,8 @@ import org.hswebframework.web.dict.EnumDict;
 public enum DataType implements EnumDict<Byte> {
 public enum DataType implements EnumDict<Byte> {
     TYPE1((byte) 1, "类型1"),
     TYPE1((byte) 1, "类型1"),
     TYPE2((byte) 2, "类型2"),
     TYPE2((byte) 2, "类型2"),
-    TYPE3((byte) 3, "类型3");
+    TYPE3((byte) 3, "类型3"),
+    TYPE4((byte) 4, "类型4");
 
 
     private Byte value;
     private Byte value;
 
 

+ 1 - 2
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/src/test/java/org/hswebframework/web/dao/crud/TestCrud.java

@@ -51,8 +51,7 @@ public class TestCrud extends AbstractTransactionalJUnit4SpringContextTests {
 
 
         QueryParamEntity query = new QueryParamEntity();
         QueryParamEntity query = new QueryParamEntity();
 
 
-        query.where("dataTypes", "in",Arrays.asList(DataType.TYPE3, DataType.TYPE3))
-        .or("name","123").or("name" ,"in","123");
+        query.where("dataTypes", "ain",Arrays.asList(DataType.TYPE4, DataType.TYPE2));
 
 
         List<TestEntity> entities = testDao.query(query);
         List<TestEntity> entities = testDao.query(query);
 
 

+ 1 - 1
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/test/java/org/hswebframework/web/authorization/starter/AutoSyncPermissionTest.java

@@ -72,7 +72,7 @@ public class AutoSyncPermissionTest {
         Assert.assertEquals(permissionEntity.getName(), "测试权限");
         Assert.assertEquals(permissionEntity.getName(), "测试权限");
         Assert.assertTrue(!permissionEntity.getActions().isEmpty());
         Assert.assertTrue(!permissionEntity.getActions().isEmpty());
 
 
-        Assert.assertEquals(permissionEntity.getOptionalFields().size(), 2);
+        Assert.assertEquals(permissionEntity.getOptionalFields().size(), 3);
     }
     }
 
 
     @Authorize(permission = "test", description = "测试权限")
     @Authorize(permission = "test", description = "测试权限")