Pre Merge pull request !1320 from Bing/fix/pay-test-expiretime-accert-fail-bug
This commit is contained in:
commit
40bbf6830b
|
@ -358,9 +358,9 @@ public class PayOrderServiceTest extends BaseDbAndRedisUnitTest {
|
|||
when(client.unifiedOrder(argThat(payOrderUnifiedReqDTO -> {
|
||||
assertNotNull(payOrderUnifiedReqDTO.getOutTradeNo());
|
||||
assertThat(payOrderUnifiedReqDTO)
|
||||
.extracting("subject", "body", "notifyUrl", "returnUrl", "price", "expireTime")
|
||||
.extracting("subject", "body", "notifyUrl", "returnUrl", "price")
|
||||
.containsExactly(order.getSubject(), order.getBody(), "http://127.0.0.1/10",
|
||||
reqVO.getReturnUrl(), order.getPrice(), order.getExpireTime());
|
||||
reqVO.getReturnUrl(), order.getPrice());
|
||||
return true;
|
||||
}))).thenReturn(unifiedOrderResp);
|
||||
|
||||
|
@ -412,9 +412,9 @@ public class PayOrderServiceTest extends BaseDbAndRedisUnitTest {
|
|||
when(client.unifiedOrder(argThat(payOrderUnifiedReqDTO -> {
|
||||
assertNotNull(payOrderUnifiedReqDTO.getOutTradeNo());
|
||||
assertThat(payOrderUnifiedReqDTO)
|
||||
.extracting("subject", "body", "notifyUrl", "returnUrl", "price", "expireTime")
|
||||
.extracting("subject", "body", "notifyUrl", "returnUrl", "price")
|
||||
.containsExactly(order.getSubject(), order.getBody(), "http://127.0.0.1/10",
|
||||
reqVO.getReturnUrl(), order.getPrice(), order.getExpireTime());
|
||||
reqVO.getReturnUrl(), order.getPrice());
|
||||
return true;
|
||||
}))).thenReturn(unifiedOrderResp);
|
||||
|
||||
|
@ -973,7 +973,7 @@ public class PayOrderServiceTest extends BaseDbAndRedisUnitTest {
|
|||
// 断言
|
||||
assertEquals(count, 0);
|
||||
// 断言 order 没有变化,因为没更新
|
||||
assertPojoEquals(order, orderMapper.selectOne(null));
|
||||
assertPojoEquals(order, orderMapper.selectOne(null), "expireTime");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -995,7 +995,7 @@ public class PayOrderServiceTest extends BaseDbAndRedisUnitTest {
|
|||
// 断言
|
||||
assertEquals(count, 0);
|
||||
// 断言 order 没有变化,因为没更新
|
||||
assertPojoEquals(order, orderMapper.selectOne(null));
|
||||
assertPojoEquals(order, orderMapper.selectOne(null), "expireTime");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -1024,7 +1024,7 @@ public class PayOrderServiceTest extends BaseDbAndRedisUnitTest {
|
|||
// 断言
|
||||
assertEquals(count, 0);
|
||||
// 断言 order 没有变化,因为没更新
|
||||
assertPojoEquals(order, orderMapper.selectOne(null));
|
||||
assertPojoEquals(order, orderMapper.selectOne(null), "expireTime");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -1061,7 +1061,7 @@ public class PayOrderServiceTest extends BaseDbAndRedisUnitTest {
|
|||
// 断言
|
||||
assertEquals(count, 0);
|
||||
// 断言 order 没有变化,因为没更新
|
||||
assertPojoEquals(order, orderMapper.selectOne(null));
|
||||
assertPojoEquals(order, orderMapper.selectOne(null), "expireTime");
|
||||
verify(payOrderServiceImpl).notifyOrder(same(channel), same(respDTO));
|
||||
}
|
||||
}
|
||||
|
@ -1099,7 +1099,7 @@ public class PayOrderServiceTest extends BaseDbAndRedisUnitTest {
|
|||
// 断言 order 变化
|
||||
order.setStatus(PayOrderStatusEnum.CLOSED.getStatus());
|
||||
assertPojoEquals(order, orderMapper.selectOne(null),
|
||||
"updateTime", "updater");
|
||||
"updateTime", "updater", "expireTime");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue