Skip to content

Commit

Permalink
feat-IQueryAbility-增加了range、in、notin、like的单元测试
Browse files Browse the repository at this point in the history
  • Loading branch information
@aruis
aruis committed Sep 5, 2024
1 parent aec9475 commit 62867aa
Show file tree
Hide file tree
Showing 2 changed files with 151 additions and 21 deletions.
168 changes: 148 additions & 20 deletions my-boot/src/test/java/net/ximatai/muyun/platform/TestQuery.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,30 +38,24 @@ class TestQuery {

String tableName;

List<String> ids;

@BeforeEach
void setUp() {
tableName = testController.getMainTable();
databaseAccess.execute("TRUNCATE TABLE %s".formatted(tableName));

var id1 = testController.create(Map.of("id", "1", "name", "test1", "t_create", "2024-01-01 12:00:00"));
var id2 = testController.create(Map.of("id", "2", "name", "test2", "t_create", "2024-01-02 12:00:00"));
var id3 = testController.create(Map.of("id", "3", "name", "test3", "t_create", "2024-01-03 12:00:00"));
var id4 = testController.create(Map.of("id", "4", "name", "test4", "t_create", "2024-01-04 12:00:00"));
var id5 = testController.create(Map.of("id", "5", "name", "test5", "t_create", "2024-01-05 12:00:00"));
var id6 = testController.create(Map.of("id", "6", "name", "test6", "t_create", "2024-01-06 12:00:00"));
var id7 = testController.create(Map.of("id", "7", "name", "test7", "t_create", "2024-01-07 12:00:00"));
var id8 = testController.create(Map.of("id", "8", "name", "test8", "t_create", "2024-01-08 12:00:00"));

ids = List.of(id1, id2, id3, id4, id5, id6, id7, id8);
testController.create(Map.of("id", "1", "name", "test1", "t_create", "2024-01-01 12:00:00"));
testController.create(Map.of("id", "2", "name", "test2", "t_create", "2024-01-02 12:00:00"));
testController.create(Map.of("id", "3", "name", "test3", "t_create", "2024-01-03 12:00:00"));
testController.create(Map.of("id", "4", "name", "test4", "t_create", "2024-01-04 12:00:00"));
testController.create(Map.of("id", "5", "name", "test5", "t_create", "2024-01-05 12:00:00"));
testController.create(Map.of("id", "6", "name", "test6", "t_create", "2024-01-06 12:00:00"));
testController.create(Map.of("id", "7", "name", "test7", "t_create", "2024-01-07 12:00:00"));
testController.create(Map.of("id", "8", "name", "test8", "t_create", "2024-01-08 12:00:00"));
}

@Test
void testEqual() {
String id = ids.getFirst();

Map<String, String> request = Map.of("id", id);
Map<String, String> request = Map.of("id", "1");

PageResult<Map> response = given()
.contentType("application/json")
Expand All @@ -77,14 +71,12 @@ void testEqual() {

assertEquals(1, response.getTotal());
assertEquals(1, response.getList().size());
assertEquals(id, response.getList().get(0).get("id"));
assertEquals("1", response.getList().get(0).get("id"));
}

@Test
void testNotEqual() {
String id = ids.getFirst();

Map<String, String> request = Map.of("no_id", id);
Map<String, String> request = Map.of("no_id", "1");

PageResult<Map> response = given()
.contentType("application/json")
Expand All @@ -101,6 +93,139 @@ void testNotEqual() {
assertEquals(7, response.getTotal());
}

@Test
void testIn() {
Map<String, ?> request = Map.of("in_id", List.of("1", "2", "3"));

PageResult<Map> response = given()
.contentType("application/json")
.queryParam("noPage", true)
.body(request)
.when()
.post("%s/view".formatted(path))
.then()
.statusCode(200)
.extract()
.as(new TypeRef<>() {
});

assertEquals(3, response.getTotal());
}

@Test
void testNotIn() {
Map<String, ?> request = Map.of("not_in_id", List.of("1", "2", "3"));

PageResult<Map> response = given()
.contentType("application/json")
.queryParam("noPage", true)
.body(request)
.when()
.post("%s/view".formatted(path))
.then()
.statusCode(200)
.extract()
.as(new TypeRef<>() {
});

assertEquals(5, response.getTotal());
}

@Test
void testLike() {
Map<String, ?> request = Map.of("name", "test");

PageResult<Map> response = given()
.contentType("application/json")
.queryParam("noPage", true)
.body(request)
.when()
.post("%s/view".formatted(path))
.then()
.statusCode(200)
.extract()
.as(new TypeRef<>() {
});

assertEquals(8, response.getTotal());
}

@Test
void testRange1() {
Map<String, ?> request = Map.of("t_create", new String[]{"2024-01-05 12:00:00", null});

PageResult<Map> response = given()
.contentType("application/json")
.queryParam("noPage", true)
.body(request)
.when()
.post("%s/view".formatted(path))
.then()
.statusCode(200)
.extract()
.as(new TypeRef<>() {
});

assertEquals(4, response.getTotal());
}

@Test
void testRange2() {
Map<String, ?> request = Map.of("t_create", new String[]{null, "2024-01-05 12:00:00"});

PageResult<Map> response = given()
.contentType("application/json")
.queryParam("noPage", true)
.body(request)
.when()
.post("%s/view".formatted(path))
.then()
.statusCode(200)
.extract()
.as(new TypeRef<>() {
});

assertEquals(4, response.getTotal());
}

@Test
void testRange3() {
Map<String, ?> request = Map.of("t_create", new String[]{"2024-01-05 00:00:00", "2024-01-05 24:00:00"});

PageResult<Map> response = given()
.contentType("application/json")
.queryParam("noPage", true)
.body(request)
.when()
.post("%s/view".formatted(path))
.then()
.statusCode(200)
.extract()
.as(new TypeRef<>() {
});

assertEquals(1, response.getTotal());
}

@Test
void testRange4() {
Map<String, ?> request = Map.of("t_create", new String[]{"2024-01-01 00:00:00", "2024-01-10 24:00:00"});

PageResult<Map> response = given()
.contentType("application/json")
.queryParam("noPage", true)
.body(request)
.when()
.post("%s/view".formatted(path))
.then()
.statusCode(200)
.extract()
.as(new TypeRef<>() {
});

assertEquals(8, response.getTotal());
}

}

@Path("/test_query")
Expand Down Expand Up @@ -131,7 +256,10 @@ public List<QueryItem> queryItemList() {
return List.of(
QueryItem.of("id"),
QueryItem.of("id").setAlias("no_id").setSymbolType(QueryItem.SymbolType.NOT_EQUAL),
QueryItem.of("name")
QueryItem.of("id").setAlias("in_id").setSymbolType(QueryItem.SymbolType.IN),
QueryItem.of("id").setAlias("not_in_id").setSymbolType(QueryItem.SymbolType.NOT_IN),
QueryItem.of("name").setSymbolType(QueryItem.SymbolType.LIKE),
QueryItem.of("t_create").setTime(true).setSymbolType(QueryItem.SymbolType.RANGE)
);
}
}
4 changes: 3 additions & 1 deletion my-core/src/main/java/net/ximatai/muyun/ability/curd/std/ISelectAbility.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,9 @@ default PageResult view(Integer page,
Object a = list.get(0);
Object b = list.get(1);

if (a != null) {
if (a == null) {
condition.append(" = %s ".formatted(qi.getField()));
} else {
condition.append(" >= ? ");
params.add(a);
}
Expand Down

0 comments on commit 62867aa

Please sign in to comment.