fix: 修复合并差异

This commit is contained in:
puhui999
2023-08-15 00:02:50 +08:00
parent de828e3d04
commit 5c2723c7bf
12 changed files with 107 additions and 364 deletions

View File

@@ -23,15 +23,15 @@ import static org.junit.jupiter.api.Assertions.*;
// TODO 芋艿:等完成后,在补全单测
/**
* {@link CombinationServiceImpl} 的单元测试类
* {@link CombinationActivityServiceImpl} 的单元测试类
*
* @author HUIHUI
*/
@Import(CombinationServiceImpl.class)
@Import(CombinationActivityServiceImpl.class)
public class CombinationActivityServiceImplTest extends BaseDbUnitTest {
@Resource
private CombinationServiceImpl combinationActivityService;
private CombinationActivityServiceImpl combinationActivityService;
@Resource
private CombinationActivityMapper combinationActivityMapper;
@@ -111,8 +111,8 @@ public class CombinationActivityServiceImplTest extends BaseDbUnitTest {
o.setStartTime(null);
o.setEndTime(null);
o.setUserSize(null);
o.setTotalNum(null);
o.setSuccessNum(null);
o.setTotalCount(null);
o.setSuccessCount(null);
o.setOrderUserCount(null);
o.setVirtualGroup(null);
o.setStatus(null);
@@ -135,9 +135,9 @@ public class CombinationActivityServiceImplTest extends BaseDbUnitTest {
// 测试 userSize 不匹配
combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setUserSize(null)));
// 测试 totalNum 不匹配
combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setTotalNum(null)));
combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setTotalCount(null)));
// 测试 successNum 不匹配
combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setSuccessNum(null)));
combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setSuccessCount(null)));
// 测试 orderUserCount 不匹配
combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setOrderUserCount(null)));
// 测试 virtualGroup 不匹配
@@ -173,8 +173,8 @@ public class CombinationActivityServiceImplTest extends BaseDbUnitTest {
o.setStartTime(null);
o.setEndTime(null);
o.setUserSize(null);
o.setTotalNum(null);
o.setSuccessNum(null);
o.setTotalCount(null);
o.setSuccessCount(null);
o.setOrderUserCount(null);
o.setVirtualGroup(null);
o.setStatus(null);
@@ -197,9 +197,9 @@ public class CombinationActivityServiceImplTest extends BaseDbUnitTest {
// 测试 userSize 不匹配
combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setUserSize(null)));
// 测试 totalNum 不匹配
combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setTotalNum(null)));
combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setTotalCount(null)));
// 测试 successNum 不匹配
combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setSuccessNum(null)));
combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setSuccessCount(null)));
// 测试 orderUserCount 不匹配
combinationActivityMapper.insert(cloneIgnoreId(dbCombinationActivity, o -> o.setOrderUserCount(null)));
// 测试 virtualGroup 不匹配