Skip to content

Commit

Permalink
change some resource file
Browse files Browse the repository at this point in the history
  • Loading branch information
@zzxxiansheng
zzxxiansheng committed Feb 5, 2024
1 parent 7f5bf0d commit 7f2e85b
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 31 deletions.
3 changes: 3 additions & 0 deletions eventmesh-dashboard-console/src/main/resources/application-dev.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ spring:
test-while-idle: true
min-evictable-idle-time-millis: 300000

mybatis:
type-aliases-package: org.apache.eventmesh.dashboard.console.entity

# cron job config, use cron expression
cron:
#health check job
Expand Down
18 changes: 9 additions & 9 deletions ...oard/console/unit/group/TestGroupDao.java → ...d/console/unit/group/TestGroupMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@

@RunWith(SpringRunner.class)
@SpringBootTest(classes = EventMeshDashboardApplication.class)
public class TestGroupDao {
public class TestGroupMapper {

@Autowired
private OprGroupMapper groupDao;
private OprGroupMapper groupMapper;

public List<GroupEntity> insertGroupData(String name) {
List<GroupEntity> groupEntities = new ArrayList<>();
for (int i = 0; i < 10; i++) {
GroupEntity groupEntity = new GroupEntity(null, (long) i, name, 0, null, 1, "OK", null, null);
groupDao.addGroup(groupEntity);
groupMapper.addGroup(groupEntity);
groupEntities.add(groupEntity);
}
return groupEntities;
Expand All @@ -35,7 +35,7 @@ public List<GroupEntity> insertGroupData(String name) {
public List<GroupEntity> getRemovedTimeList(String name) {
GroupEntity groupEntity = new GroupEntity();
groupEntity.setName(name);
List<GroupEntity> groupEntities = groupDao.selectGroupByDynamic(groupEntity);
List<GroupEntity> groupEntities = groupMapper.selectGroupByDynamic(groupEntity);
for (GroupEntity groupEntity1 : groupEntities) {
groupEntity1.setCreateTime(null);
groupEntity1.setUpdateTime(null);
Expand All @@ -48,7 +48,7 @@ public void test_addGroup() {
List<GroupEntity> groupEntities = this.insertGroupData("addGroup");
GroupEntity groupEntity = new GroupEntity();
groupEntity.setName("addGroup");
List<GroupEntity> groupEntities1 = groupDao.selectGroupByDynamic(groupEntity);
List<GroupEntity> groupEntities1 = groupMapper.selectGroupByDynamic(groupEntity);
Assert.assertEquals(groupEntities, this.getRemovedTimeList("addGroup"));
}

Expand All @@ -60,23 +60,23 @@ public void test_updateGroupById() {
groupEntity.setMembers("1,");
groupEntity.setState("fail");
groupEntity.setMemberCount(1);
groupDao.updateGroup(groupEntity);
groupMapper.updateGroup(groupEntity);
Assert.assertEquals(groupEntities, this.getRemovedTimeList("updateById2"));
}

@Test
public void test_deleteGroupById() {
List<GroupEntity> groupEntities = this.insertGroupData("deleteById");
GroupEntity groupEntity = groupEntities.get(9);
groupDao.deleteGroup(groupEntity);
groupMapper.deleteGroup(groupEntity);
groupEntities.remove(9);
Assert.assertEquals(groupEntities, this.getRemovedTimeList("deleteById"));
}

@Test
public void test_selectGroupById() {
List<GroupEntity> groupEntities = this.insertGroupData("selectById");
GroupEntity groupEntity = groupDao.selectGroupById(groupEntities.get(0));
GroupEntity groupEntity = groupMapper.selectGroupById(groupEntities.get(0));
groupEntity.setCreateTime(null);
groupEntity.setUpdateTime(null);
Assert.assertEquals(groupEntities.get(0), groupEntity);
Expand All @@ -88,7 +88,7 @@ public void test_selectGroupByClusterId() {
GroupEntity groupEntity1 = new GroupEntity();
groupEntity1.setClusterId(groupEntities.get(0).getClusterId());
groupEntity1.setName(groupEntities.get(0).getName());
GroupEntity groupEntity = groupDao.selectGroupByUnique(groupEntity1);
GroupEntity groupEntity = groupMapper.selectGroupByUnique(groupEntity1);
groupEntity.setCreateTime(null);
groupEntity.setUpdateTime(null);
Assert.assertEquals(groupEntities.get(0), groupEntity);
Expand Down
22 changes: 11 additions & 11 deletions .../unit/groupmember/testGroupMemberDao.java → ...it/groupmember/testGroupMemberMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@

@RunWith(SpringRunner.class)
@SpringBootTest(classes = EventMeshDashboardApplication.class)
public class testGroupMemberDao {
public class testGroupMemberMapper {

@Autowired
OprGroupMemberMapper groupMemberDao;
OprGroupMemberMapper groupMemberMapper;

public List<GroupMemberEntity> insertGroupData(String topicName, String groupName) {
List<GroupMemberEntity> groupMemberEntities = new ArrayList<>();
for (int i = 0; i < 10; i++) {
GroupMemberEntity groupMemberEntity = new GroupMemberEntity(null, (long) i, topicName, groupName, "admin", "active", null, null);
groupMemberDao.addGroupMember(groupMemberEntity);
groupMemberMapper.addGroupMember(groupMemberEntity);
groupMemberEntities.add(groupMemberEntity);
}
return groupMemberEntities;
Expand All @@ -35,7 +35,7 @@ public List<GroupMemberEntity> getRemovedTimeList(String topicName, String group
GroupMemberEntity groupMemberEntity = new GroupMemberEntity();
groupMemberEntity.setTopicName(topicName);
groupMemberEntity.setGroupName(groupName);
List<GroupMemberEntity> groupEntities = groupMemberDao.selectAllMemberByDynamic(groupMemberEntity);
List<GroupMemberEntity> groupEntities = groupMemberMapper.selectAllMemberByDynamic(groupMemberEntity);
for (GroupMemberEntity groupEntity1 : groupEntities) {
groupEntity1.setCreateTime(null);
groupEntity1.setUpdateTime(null);
Expand All @@ -54,7 +54,7 @@ public void test_getGroupMemberByClusterId() {
List<GroupMemberEntity> add1 = this.insertGroupData("getByCluster", "groupMember");
GroupMemberEntity groupMemberEntity = new GroupMemberEntity();
groupMemberEntity.setClusterId(add1.get(1).getClusterId());
List<GroupMemberEntity> groupByClusterId = groupMemberDao.getGroupByClusterId(groupMemberEntity);
List<GroupMemberEntity> groupByClusterId = groupMemberMapper.getGroupByClusterId(groupMemberEntity);
GroupMemberEntity groupMemberEntity1 = groupByClusterId.get(0);
groupMemberEntity1.setCreateTime(null);
groupMemberEntity1.setUpdateTime(null);
Expand All @@ -67,7 +67,7 @@ public void test_deleteGroupMemberById() {
List<GroupMemberEntity> add1 = this.insertGroupData("getById", "groupMember");
GroupMemberEntity groupMemberEntity = new GroupMemberEntity();
groupMemberEntity.setId(add1.get(2).getId());
GroupMemberEntity groupMemberEntity1 = groupMemberDao.selectGroupMemberById(groupMemberEntity);
GroupMemberEntity groupMemberEntity1 = groupMemberMapper.selectGroupMemberById(groupMemberEntity);
groupMemberEntity1.setUpdateTime(null);
groupMemberEntity1.setCreateTime(null);
Assert.assertEquals(groupMemberEntity1, add1.get(2));
Expand All @@ -80,8 +80,8 @@ public void test_updateGroupMemberById() {
add1.get(1).setState("fail1");
groupMemberEntity.setState("fail1");
groupMemberEntity.setId(add1.get(1).getId());
groupMemberDao.updateGroupMember(groupMemberEntity);
GroupMemberEntity groupMemberEntity1 = groupMemberDao.selectGroupMemberById(add1.get(1));
groupMemberMapper.updateGroupMember(groupMemberEntity);
GroupMemberEntity groupMemberEntity1 = groupMemberMapper.selectGroupMemberById(add1.get(1));
groupMemberEntity1.setUpdateTime(null);
groupMemberEntity1.setCreateTime(null);
Assert.assertEquals(groupMemberEntity1, add1.get(1));
Expand All @@ -94,7 +94,7 @@ public void test_selectGroupMemberByUnique() {
groupMemberEntity.setClusterId(groupMemberEntities.get(1).getClusterId());
groupMemberEntity.setTopicName(groupMemberEntities.get(1).getTopicName());
groupMemberEntity.setGroupName(groupMemberEntities.get(1).getGroupName());
GroupMemberEntity groupMemberEntity1 = groupMemberDao.selectGroupMemberByUnique(groupMemberEntity);
GroupMemberEntity groupMemberEntity1 = groupMemberMapper.selectGroupMemberByUnique(groupMemberEntity);
groupMemberEntity1.setUpdateTime(null);
groupMemberEntity1.setCreateTime(null);
Assert.assertEquals(groupMemberEntity1, groupMemberEntities.get(1));
Expand Down Expand Up @@ -123,7 +123,7 @@ public void test_updateGroupMemberByTopic() {
GroupMemberEntity groupMemberEntity = new GroupMemberEntity();
groupMemberEntity.setState("fail2");
groupMemberEntity.setTopicName("updateByTopic1");
groupMemberDao.updateMemberByTopic(groupMemberEntity);
groupMemberMapper.updateMemberByTopic(groupMemberEntity);
Assert.assertEquals(this.getRemovedTimeList("updateByTopic1", null), groupMemberEntities);
}

Expand All @@ -132,7 +132,7 @@ public void test_selectGroupMemberById() {
List<GroupMemberEntity> groupMemberEntities = this.insertGroupData("updateById1", "groupMember2");
GroupMemberEntity groupMemberEntity = new GroupMemberEntity();
groupMemberEntity.setId(groupMemberEntities.get(5).getId());
GroupMemberEntity groupMemberEntity1 = groupMemberDao.selectGroupMemberById(groupMemberEntity);
GroupMemberEntity groupMemberEntity1 = groupMemberMapper.selectGroupMemberById(groupMemberEntity);
groupMemberEntity1.setCreateTime(null);
groupMemberEntity1.setUpdateTime(null);
Assert.assertEquals(groupMemberEntity1, groupMemberEntities.get(5));
Expand Down
22 changes: 11 additions & 11 deletions ...oard/console/unit/topic/testTopicDao.java → ...d/console/unit/topic/testTopicMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@

@RunWith(SpringRunner.class)
@SpringBootTest(classes = EventMeshDashboardApplication.class)
public class testTopicDao {
public class testTopicMapper {

@Autowired
private TopicMapper topicDao;
private TopicMapper topicMapper;

public List<TopicEntity> insertGroupData(String topicName) {
List<TopicEntity> topicEntities = new ArrayList<>();
for (int i = 0; i < 10; i++) {
TopicEntity topicEntity = new TopicEntity(null, (long) i, topicName, "10", "10", 100L, 1, "testTopic", null, null);
topicDao.addTopic(topicEntity);
topicMapper.addTopic(topicEntity);
topicEntities.add(topicEntity);
}
return topicEntities;
Expand All @@ -35,7 +35,7 @@ public List<TopicEntity> getRemovedTimeList(String topicName, Long clusterId) {
TopicEntity topicEntity = new TopicEntity();
topicEntity.setTopicName(topicName);
topicEntity.setClusterId(clusterId);
List<TopicEntity> topicEntities = topicDao.getTopicListByDynamic(topicEntity);
List<TopicEntity> topicEntities = topicMapper.getTopicListByDynamic(topicEntity);
for (TopicEntity topic : topicEntities) {
topic.setCreateTime(null);
topic.setUpdateTime(null);
Expand All @@ -48,7 +48,7 @@ public void test_selectTopicByClusterId() {
List<TopicEntity> topicEntities = this.insertGroupData("SelectById111");
TopicEntity topicEntity = new TopicEntity();
topicEntity.setClusterId(topicEntities.get(9).getClusterId());
List<TopicEntity> topicEntity1 = topicDao.getTopicListByDynamic(topicEntity);
List<TopicEntity> topicEntity1 = topicMapper.getTopicListByDynamic(topicEntity);
topicEntity1.get(0).setCreateTime(null);
topicEntity1.get(0).setUpdateTime(null);
Assert.assertEquals(topicEntity1.get(0), topicEntities.get(9));
Expand All @@ -71,8 +71,8 @@ public void test_UpdateTopic() {
topicEntity.setDescription("updateTest1");
topicEntity.setType(-1);
topicEntity.setId(topicEntities.get(5).getId());
topicDao.updateTopic(topicEntity);
TopicEntity topicEntity1 = topicDao.selectTopicById(topicEntity);
topicMapper.updateTopic(topicEntity);
TopicEntity topicEntity1 = topicMapper.selectTopicById(topicEntity);
topicEntity1.setUpdateTime(null);
topicEntity1.setCreateTime(null);
Assert.assertEquals(topicEntity1, topicEntities.get(5));
Expand All @@ -85,8 +85,8 @@ public void test_DeleteTopic() {
topicEntity.setId(topicEntities.get(5).getId());
topicEntity.setClusterId(topicEntities.get(5).getClusterId());
topicEntity.setTopicName("update72");
topicDao.deleteTopic(topicEntity);
List<TopicEntity> topicEntity1 = topicDao.getTopicListByDynamic(topicEntity);
topicMapper.deleteTopic(topicEntity);
List<TopicEntity> topicEntity1 = topicMapper.getTopicListByDynamic(topicEntity);
Assert.assertEquals(true, topicEntity1.isEmpty());
}

Expand All @@ -96,7 +96,7 @@ public void test_selectTopicByUnique() {
TopicEntity topicEntity = new TopicEntity();
topicEntity.setTopicName("unique11");
topicEntity.setClusterId(topicEntities.get(1).getClusterId());
TopicEntity topicEntity1 = topicDao.selectTopicByUnique(topicEntity);
TopicEntity topicEntity1 = topicMapper.selectTopicByUnique(topicEntity);
topicEntity1.setUpdateTime(null);
topicEntity1.setCreateTime(null);
Assert.assertEquals(topicEntity1, topicEntities.get(1));
Expand All @@ -107,7 +107,7 @@ public void test_selectTopicById() {
List<TopicEntity> topicEntities = this.insertGroupData("id1");
TopicEntity topicEntity = new TopicEntity();
topicEntity.setId(topicEntities.get(2).getId());
TopicEntity topicEntity1 = topicDao.selectTopicById(topicEntity);
TopicEntity topicEntity1 = topicMapper.selectTopicById(topicEntity);
topicEntity1.setCreateTime(null);
topicEntity1.setUpdateTime(null);
Assert.assertEquals(topicEntity1, topicEntities.get(2));
Expand Down

0 comments on commit 7f2e85b

Please sign in to comment.