Commit a86cbde090569cf6c6850ab44000ee7ef8ca8042

Authored by franky
1 parent e314f4aa

商品spu和sku测试类调整

yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/sku/SkuServiceImplTest.java
@@ -99,7 +99,7 @@ public class SkuServiceImplTest extends BaseDbUnitTest { @@ -99,7 +99,7 @@ public class SkuServiceImplTest extends BaseDbUnitTest {
99 // 准备参数 99 // 准备参数
100 Integer id = 1; 100 Integer id = 1;
101 101
102 - // 调用, 并断言异常spu 102 + // 调用, 并断言异常
103 assertServiceException(() -> skuService.deleteSku(id), SKU_NOT_EXISTS); 103 assertServiceException(() -> skuService.deleteSku(id), SKU_NOT_EXISTS);
104 } 104 }
105 105
@@ -108,25 +108,21 @@ public class SkuServiceImplTest extends BaseDbUnitTest { @@ -108,25 +108,21 @@ public class SkuServiceImplTest extends BaseDbUnitTest {
108 public void testGetSkuPage() { 108 public void testGetSkuPage() {
109 // mock 数据 109 // mock 数据
110 SkuDO dbSku = randomPojo(SkuDO.class, o -> { // 等会查询到 110 SkuDO dbSku = randomPojo(SkuDO.class, o -> { // 等会查询到
111 - o.setCreateTime(null);  
112 o.setSpuId(null); 111 o.setSpuId(null);
113 - o.setSkuStatus(null);  
114 - o.setAttrs(null); 112 + o.setProperties(null);
115 o.setPrice(null); 113 o.setPrice(null);
116 o.setOriginalPrice(null); 114 o.setOriginalPrice(null);
117 o.setCostPrice(null); 115 o.setCostPrice(null);
118 o.setBarCode(null); 116 o.setBarCode(null);
119 o.setPicUrl(null); 117 o.setPicUrl(null);
  118 + o.setStatus(null);
  119 + o.setCreateTime(null);
120 }); 120 });
121 skuMapper.insert(dbSku); 121 skuMapper.insert(dbSku);
122 - // 测试 createTime 不匹配  
123 - skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setCreateTime(null)));  
124 // 测试 spuId 不匹配 122 // 测试 spuId 不匹配
125 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setSpuId(null))); 123 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setSpuId(null)));
126 - // 测试 skuStatus 不匹配  
127 - skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setSkuStatus(null)));  
128 - // 测试 attrs 不匹配  
129 - skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setAttrs(null))); 124 + // 测试 properties 不匹配
  125 + skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setProperties(null)));
130 // 测试 price 不匹配 126 // 测试 price 不匹配
131 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setPrice(null))); 127 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setPrice(null)));
132 // 测试 originalPrice 不匹配 128 // 测试 originalPrice 不匹配
@@ -137,18 +133,22 @@ public class SkuServiceImplTest extends BaseDbUnitTest { @@ -137,18 +133,22 @@ public class SkuServiceImplTest extends BaseDbUnitTest {
137 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setBarCode(null))); 133 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setBarCode(null)));
138 // 测试 picUrl 不匹配 134 // 测试 picUrl 不匹配
139 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setPicUrl(null))); 135 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setPicUrl(null)));
  136 + // 测试 status 不匹配
  137 + skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setStatus(null)));
  138 + // 测试 createTime 不匹配
  139 + skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setCreateTime(null)));
140 // 准备参数 140 // 准备参数
141 SkuPageReqVO reqVO = new SkuPageReqVO(); 141 SkuPageReqVO reqVO = new SkuPageReqVO();
142 - reqVO.setBeginCreateTime(null);  
143 - reqVO.setEndCreateTime(null);  
144 reqVO.setSpuId(null); 142 reqVO.setSpuId(null);
145 - reqVO.setSkuStatus(null);  
146 - reqVO.setAttrs(null); 143 + reqVO.setProperties(null);
147 reqVO.setPrice(null); 144 reqVO.setPrice(null);
148 reqVO.setOriginalPrice(null); 145 reqVO.setOriginalPrice(null);
149 reqVO.setCostPrice(null); 146 reqVO.setCostPrice(null);
150 reqVO.setBarCode(null); 147 reqVO.setBarCode(null);
151 reqVO.setPicUrl(null); 148 reqVO.setPicUrl(null);
  149 + reqVO.setStatus(null);
  150 + reqVO.setBeginCreateTime(null);
  151 + reqVO.setEndCreateTime(null);
152 152
153 // 调用 153 // 调用
154 PageResult<SkuDO> pageResult = skuService.getSkuPage(reqVO); 154 PageResult<SkuDO> pageResult = skuService.getSkuPage(reqVO);
@@ -163,25 +163,21 @@ public class SkuServiceImplTest extends BaseDbUnitTest { @@ -163,25 +163,21 @@ public class SkuServiceImplTest extends BaseDbUnitTest {
163 public void testGetSkuList() { 163 public void testGetSkuList() {
164 // mock 数据 164 // mock 数据
165 SkuDO dbSku = randomPojo(SkuDO.class, o -> { // 等会查询到 165 SkuDO dbSku = randomPojo(SkuDO.class, o -> { // 等会查询到
166 - o.setCreateTime(null);  
167 o.setSpuId(null); 166 o.setSpuId(null);
168 - o.setSkuStatus(null);  
169 - o.setAttrs(null); 167 + o.setProperties(null);
170 o.setPrice(null); 168 o.setPrice(null);
171 o.setOriginalPrice(null); 169 o.setOriginalPrice(null);
172 o.setCostPrice(null); 170 o.setCostPrice(null);
173 o.setBarCode(null); 171 o.setBarCode(null);
174 o.setPicUrl(null); 172 o.setPicUrl(null);
  173 + o.setStatus(null);
  174 + o.setCreateTime(null);
175 }); 175 });
176 skuMapper.insert(dbSku); 176 skuMapper.insert(dbSku);
177 - // 测试 createTime 不匹配  
178 - skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setCreateTime(null)));  
179 // 测试 spuId 不匹配 177 // 测试 spuId 不匹配
180 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setSpuId(null))); 178 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setSpuId(null)));
181 - // 测试 skuStatus 不匹配  
182 - skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setSkuStatus(null)));  
183 - // 测试 attrs 不匹配  
184 - skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setAttrs(null))); 179 + // 测试 properties 不匹配
  180 + skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setProperties(null)));
185 // 测试 price 不匹配 181 // 测试 price 不匹配
186 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setPrice(null))); 182 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setPrice(null)));
187 // 测试 originalPrice 不匹配 183 // 测试 originalPrice 不匹配
@@ -192,18 +188,22 @@ public class SkuServiceImplTest extends BaseDbUnitTest { @@ -192,18 +188,22 @@ public class SkuServiceImplTest extends BaseDbUnitTest {
192 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setBarCode(null))); 188 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setBarCode(null)));
193 // 测试 picUrl 不匹配 189 // 测试 picUrl 不匹配
194 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setPicUrl(null))); 190 skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setPicUrl(null)));
  191 + // 测试 status 不匹配
  192 + skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setStatus(null)));
  193 + // 测试 createTime 不匹配
  194 + skuMapper.insert(cloneIgnoreId(dbSku, o -> o.setCreateTime(null)));
195 // 准备参数 195 // 准备参数
196 SkuExportReqVO reqVO = new SkuExportReqVO(); 196 SkuExportReqVO reqVO = new SkuExportReqVO();
197 - reqVO.setBeginCreateTime(null);  
198 - reqVO.setEndCreateTime(null);  
199 reqVO.setSpuId(null); 197 reqVO.setSpuId(null);
200 - reqVO.setSkuStatus(null);  
201 - reqVO.setAttrs(null); 198 + reqVO.setProperties(null);
202 reqVO.setPrice(null); 199 reqVO.setPrice(null);
203 reqVO.setOriginalPrice(null); 200 reqVO.setOriginalPrice(null);
204 reqVO.setCostPrice(null); 201 reqVO.setCostPrice(null);
205 reqVO.setBarCode(null); 202 reqVO.setBarCode(null);
206 reqVO.setPicUrl(null); 203 reqVO.setPicUrl(null);
  204 + reqVO.setStatus(null);
  205 + reqVO.setBeginCreateTime(null);
  206 + reqVO.setEndCreateTime(null);
207 207
208 // 调用 208 // 调用
209 List<SkuDO> list = skuService.getSkuList(reqVO); 209 List<SkuDO> list = skuService.getSkuList(reqVO);
yudao-module-mall/yudao-module-product-biz/src/test/java/cn/iocoder/yudao/module/product/service/spu/SpuServiceImplTest.java
@@ -108,34 +108,27 @@ public class SpuServiceImplTest extends BaseDbUnitTest { @@ -108,34 +108,27 @@ public class SpuServiceImplTest extends BaseDbUnitTest {
108 public void testGetSpuPage() { 108 public void testGetSpuPage() {
109 // mock 数据 109 // mock 数据
110 SpuDO dbSpu = randomPojo(SpuDO.class, o -> { // 等会查询到 110 SpuDO dbSpu = randomPojo(SpuDO.class, o -> { // 等会查询到
111 - o.setCreateTime(null);  
112 o.setName(null); 111 o.setName(null);
113 - o.setVisible(null);  
114 o.setSellPoint(null); 112 o.setSellPoint(null);
115 o.setDescription(null); 113 o.setDescription(null);
116 - o.setCid(null);  
117 - o.setListPicUrl(null); 114 + o.setCategoryId(null);
118 o.setPicUrls(null); 115 o.setPicUrls(null);
119 o.setSort(null); 116 o.setSort(null);
120 o.setLikeCount(null); 117 o.setLikeCount(null);
121 o.setPrice(null); 118 o.setPrice(null);
122 o.setQuantity(null); 119 o.setQuantity(null);
  120 + o.setStatus(null);
  121 + o.setCreateTime(null);
123 }); 122 });
124 spuMapper.insert(dbSpu); 123 spuMapper.insert(dbSpu);
125 - // 测试 createTime 不匹配  
126 - spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setCreateTime(null)));  
127 // 测试 name 不匹配 124 // 测试 name 不匹配
128 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setName(null))); 125 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setName(null)));
129 - // 测试 visible 不匹配  
130 - spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setVisible(null)));  
131 // 测试 sellPoint 不匹配 126 // 测试 sellPoint 不匹配
132 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setSellPoint(null))); 127 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setSellPoint(null)));
133 // 测试 description 不匹配 128 // 测试 description 不匹配
134 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setDescription(null))); 129 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setDescription(null)));
135 - // 测试 cid 不匹配  
136 - spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setCid(null)));  
137 - // 测试 listPicUrl 不匹配  
138 - spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setListPicUrl(null))); 130 + // 测试 categoryId 不匹配
  131 + spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setCategoryId(null)));
139 // 测试 picUrls 不匹配 132 // 测试 picUrls 不匹配
140 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setPicUrls(null))); 133 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setPicUrls(null)));
141 // 测试 sort 不匹配 134 // 测试 sort 不匹配
@@ -146,21 +139,24 @@ public class SpuServiceImplTest extends BaseDbUnitTest { @@ -146,21 +139,24 @@ public class SpuServiceImplTest extends BaseDbUnitTest {
146 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setPrice(null))); 139 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setPrice(null)));
147 // 测试 quantity 不匹配 140 // 测试 quantity 不匹配
148 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setQuantity(null))); 141 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setQuantity(null)));
  142 + // 测试 status 不匹配
  143 + spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setStatus(null)));
  144 + // 测试 createTime 不匹配
  145 + spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setCreateTime(null)));
149 // 准备参数 146 // 准备参数
150 SpuPageReqVO reqVO = new SpuPageReqVO(); 147 SpuPageReqVO reqVO = new SpuPageReqVO();
151 - reqVO.setBeginCreateTime(null);  
152 - reqVO.setEndCreateTime(null);  
153 reqVO.setName(null); 148 reqVO.setName(null);
154 - reqVO.setVisible(null);  
155 reqVO.setSellPoint(null); 149 reqVO.setSellPoint(null);
156 reqVO.setDescription(null); 150 reqVO.setDescription(null);
157 - reqVO.setCid(null);  
158 - reqVO.setListPicUrl(null); 151 + reqVO.setCategoryId(null);
159 reqVO.setPicUrls(null); 152 reqVO.setPicUrls(null);
160 reqVO.setSort(null); 153 reqVO.setSort(null);
161 reqVO.setLikeCount(null); 154 reqVO.setLikeCount(null);
162 reqVO.setPrice(null); 155 reqVO.setPrice(null);
163 reqVO.setQuantity(null); 156 reqVO.setQuantity(null);
  157 + reqVO.setStatus(null);
  158 + reqVO.setBeginCreateTime(null);
  159 + reqVO.setEndCreateTime(null);
164 160
165 // 调用 161 // 调用
166 PageResult<SpuDO> pageResult = spuService.getSpuPage(reqVO); 162 PageResult<SpuDO> pageResult = spuService.getSpuPage(reqVO);
@@ -175,34 +171,27 @@ public class SpuServiceImplTest extends BaseDbUnitTest { @@ -175,34 +171,27 @@ public class SpuServiceImplTest extends BaseDbUnitTest {
175 public void testGetSpuList() { 171 public void testGetSpuList() {
176 // mock 数据 172 // mock 数据
177 SpuDO dbSpu = randomPojo(SpuDO.class, o -> { // 等会查询到 173 SpuDO dbSpu = randomPojo(SpuDO.class, o -> { // 等会查询到
178 - o.setCreateTime(null);  
179 o.setName(null); 174 o.setName(null);
180 - o.setVisible(null);  
181 o.setSellPoint(null); 175 o.setSellPoint(null);
182 o.setDescription(null); 176 o.setDescription(null);
183 - o.setCid(null);  
184 - o.setListPicUrl(null); 177 + o.setCategoryId(null);
185 o.setPicUrls(null); 178 o.setPicUrls(null);
186 o.setSort(null); 179 o.setSort(null);
187 o.setLikeCount(null); 180 o.setLikeCount(null);
188 o.setPrice(null); 181 o.setPrice(null);
189 o.setQuantity(null); 182 o.setQuantity(null);
  183 + o.setStatus(null);
  184 + o.setCreateTime(null);
190 }); 185 });
191 spuMapper.insert(dbSpu); 186 spuMapper.insert(dbSpu);
192 - // 测试 createTime 不匹配  
193 - spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setCreateTime(null)));  
194 // 测试 name 不匹配 187 // 测试 name 不匹配
195 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setName(null))); 188 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setName(null)));
196 - // 测试 visible 不匹配  
197 - spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setVisible(null)));  
198 // 测试 sellPoint 不匹配 189 // 测试 sellPoint 不匹配
199 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setSellPoint(null))); 190 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setSellPoint(null)));
200 // 测试 description 不匹配 191 // 测试 description 不匹配
201 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setDescription(null))); 192 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setDescription(null)));
202 - // 测试 cid 不匹配  
203 - spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setCid(null)));  
204 - // 测试 listPicUrl 不匹配  
205 - spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setListPicUrl(null))); 193 + // 测试 categoryId 不匹配
  194 + spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setCategoryId(null)));
206 // 测试 picUrls 不匹配 195 // 测试 picUrls 不匹配
207 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setPicUrls(null))); 196 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setPicUrls(null)));
208 // 测试 sort 不匹配 197 // 测试 sort 不匹配
@@ -213,21 +202,24 @@ public class SpuServiceImplTest extends BaseDbUnitTest { @@ -213,21 +202,24 @@ public class SpuServiceImplTest extends BaseDbUnitTest {
213 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setPrice(null))); 202 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setPrice(null)));
214 // 测试 quantity 不匹配 203 // 测试 quantity 不匹配
215 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setQuantity(null))); 204 spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setQuantity(null)));
  205 + // 测试 status 不匹配
  206 + spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setStatus(null)));
  207 + // 测试 createTime 不匹配
  208 + spuMapper.insert(cloneIgnoreId(dbSpu, o -> o.setCreateTime(null)));
216 // 准备参数 209 // 准备参数
217 SpuExportReqVO reqVO = new SpuExportReqVO(); 210 SpuExportReqVO reqVO = new SpuExportReqVO();
218 - reqVO.setBeginCreateTime(null);  
219 - reqVO.setEndCreateTime(null);  
220 reqVO.setName(null); 211 reqVO.setName(null);
221 - reqVO.setVisible(null);  
222 reqVO.setSellPoint(null); 212 reqVO.setSellPoint(null);
223 reqVO.setDescription(null); 213 reqVO.setDescription(null);
224 - reqVO.setCid(null);  
225 - reqVO.setListPicUrl(null); 214 + reqVO.setCategoryId(null);
226 reqVO.setPicUrls(null); 215 reqVO.setPicUrls(null);
227 reqVO.setSort(null); 216 reqVO.setSort(null);
228 reqVO.setLikeCount(null); 217 reqVO.setLikeCount(null);
229 reqVO.setPrice(null); 218 reqVO.setPrice(null);
230 reqVO.setQuantity(null); 219 reqVO.setQuantity(null);
  220 + reqVO.setStatus(null);
  221 + reqVO.setBeginCreateTime(null);
  222 + reqVO.setEndCreateTime(null);
231 223
232 // 调用 224 // 调用
233 List<SpuDO> list = spuService.getSpuList(reqVO); 225 List<SpuDO> list = spuService.getSpuList(reqVO);