测试类类名修改到更规范

src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -321,7 +321,7 @@ public class PublicInquiryController {
      * @return
      */
     @RequestMapping(value = "/getCountOfLastAndThisMonth", method = RequestMethod.GET)
-    public ModelMap getPurcInquiryItemCountByMonth() {
+    public ModelMap getCountOfLastAndThisMonth() {
         long start = System.currentTimeMillis();
         ModelMap map = publicInquiryService.getCountOfLastAndThisMonth();
         log.info("/inquiry/public/getCountOfLastAndThisMonth,公共询价单明细本月数量和上月数量, 耗时: {}", (System.currentTimeMillis() - start));

src/test/java/com/uas/ps/inquiry/ErpDownTest.java → src/test/java/com/uas/ps/inquiry/controller/ErpDownloadControllerTest.java

@@ -1,6 +1,7 @@
-package com.uas.ps.inquiry;
+package com.uas.ps.inquiry.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.uas.ps.inquiry.BaseJunitTest;
 import com.uas.ps.inquiry.entity.BatchInProduct;
 import com.uas.ps.inquiry.entity.BatchInquiry;
 import com.uas.ps.inquiry.entity.Inquiry;
@@ -19,7 +20,7 @@ import java.util.List;
  * @since 2018年9月27日
  */
 
-public class ErpDownTest extends BaseJunitTest {
+public class ErpDownloadControllerTest extends BaseJunitTest {
 
     /**
      * localhost
@@ -46,7 +47,7 @@ public class ErpDownTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void savePublicInquiry() throws Exception {
+    public void testSaveInquiries() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         List<BatchInquiry> inquiries = new ArrayList<>();
         BatchInquiry batchInquiry = new BatchInquiry();
@@ -87,7 +88,7 @@ public class ErpDownTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void check() throws Exception {
+    public void testUpdateInquiryStatus() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         List<BatchInquiry> inquiries = new ArrayList<>();
         BatchInquiry batchInquiry = new BatchInquiry();
@@ -126,7 +127,7 @@ public class ErpDownTest extends BaseJunitTest {
      * /quotation
      */
     @Test
-    public void quotation() throws Exception {
+    public void testGetReply() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("enuu", enUU);
         HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/quotation", params);
@@ -137,7 +138,7 @@ public class ErpDownTest extends BaseJunitTest {
      * /reply/back
      */
     @Test
-    public void replyBack() throws Exception {
+    public void testOnReplySuccess() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("enuu", enUU);
         params.put("data", "1223,1224,1225,1226,1227");
@@ -150,7 +151,7 @@ public class ErpDownTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void replyDecide() throws Exception {
+    public void testOnReplyDecide() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         List<InquiryDecide> inquiryDecides = new ArrayList<>();
         InquiryDecide inquiryDecide = new InquiryDecide();
@@ -171,7 +172,7 @@ public class ErpDownTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void invalid() throws Exception {
+    public void testOnReplyInvalid() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         List<Inquiry> inquiries = new ArrayList<>();
         Inquiry inquiry = new Inquiry();
@@ -187,7 +188,7 @@ public class ErpDownTest extends BaseJunitTest {
      * /down/decide
      */
     @Test
-    public void downloadDecide() throws Exception {
+    public void testDownloadDecide() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("enuu", enUU);
         HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/down/decide", params);
@@ -198,7 +199,7 @@ public class ErpDownTest extends BaseJunitTest {
      * /down/decide/back
      */
     @Test
-    public void downDecideBack() throws Exception {
+    public void testDownloadDecideBack() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("enuu", enUU);
         params.put("data", "1223,1224,1225,1226,1227");
@@ -210,7 +211,7 @@ public class ErpDownTest extends BaseJunitTest {
      * /down/reply
      */
     @Test
-    public void downReply() throws Exception {
+    public void testDownReply() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("enuu", enUU);
         HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/down/reply", params);
@@ -221,7 +222,7 @@ public class ErpDownTest extends BaseJunitTest {
      * /down/reply/back
      */
     @Test
-    public void downReplyBack() throws Exception {
+    public void testOnReplyDownSuccess() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("enUU", enUU);
         params.put("ids", "1223,1224,1225,1226,1227");
@@ -233,7 +234,7 @@ public class ErpDownTest extends BaseJunitTest {
      * /enremind
      */
     @Test
-    public void enremind() throws Exception {
+    public void testDownEnRemind() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("vendUU", enUU);
         HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/enremind", params);
@@ -244,7 +245,7 @@ public class ErpDownTest extends BaseJunitTest {
      * /enremind/back
      */
     @Test
-    public void enremindBack() throws Exception {
+    public void testDownEnRemindSuccess() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("vendUU", enUU);
         params.put("ids", "1223,1224,1225,1226,1227");

src/test/java/com/uas/ps/inquiry/InquiryForBuyerTest.java → src/test/java/com/uas/ps/inquiry/controller/InquiryForBuyerControllerTest.java

@@ -1,6 +1,7 @@
-package com.uas.ps.inquiry;
+package com.uas.ps.inquiry.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.uas.ps.inquiry.BaseJunitTest;
 import com.uas.ps.inquiry.entity.Constant;
 import com.uas.ps.inquiry.model.PurcInquiry;
 import com.uas.ps.inquiry.model.PurcInquiryItem;
@@ -21,7 +22,7 @@ import java.util.Set;
  * @since 2018/9/12 0012 上午 11:24
  */
 
-public class InquiryForBuyerTest extends BaseJunitTest {
+public class InquiryForBuyerControllerTest extends BaseJunitTest {
 
 
     /**
@@ -48,7 +49,7 @@ public class InquiryForBuyerTest extends BaseJunitTest {
      * /detail
      */
     @Test
-    public void findById() throws Exception {
+    public void testFindById() throws Exception {
         Long id = 59L;
         Long enuu = 10041166L;
         HashMap<String, Object> params = new HashMap<>();
@@ -63,7 +64,7 @@ public class InquiryForBuyerTest extends BaseJunitTest {
      * /inquiryList
      */
     @Test
-    public void inquiryList() throws Exception {
+    public void testGetInquiry() throws Exception {
         SearchFilter searchFilter = new SearchFilter();
         searchFilter.setEnUU(1001166L);
         searchFilter.setUserUU(1000002503L);
@@ -79,7 +80,7 @@ public class InquiryForBuyerTest extends BaseJunitTest {
      * /list
      */
     @Test
-    public void list() throws Exception {
+    public void testGetInquiryList() throws Exception {
         SearchFilter searchFilter = new SearchFilter();
         searchFilter.setEnUU(1001166L);
         searchFilter.setUserUU(1000002503L);
@@ -96,7 +97,7 @@ public class InquiryForBuyerTest extends BaseJunitTest {
      * /product/detail
      */
     @Test
-    public void productDetail() throws Exception {
+    public void testFindInquiryDetailById() throws Exception {
         Long id = 9L;
         Long enuu = 10041166L;
         HashMap<String, Object> params = new HashMap<>();
@@ -110,7 +111,7 @@ public class InquiryForBuyerTest extends BaseJunitTest {
      * /quotations
      */
     @Test
-    public void quotations() throws Exception {
+    public void testFindQuotationsByPage() throws Exception {
         SearchFilter searchFilter = new SearchFilter();
         searchFilter.setEnUU(1001166L);
         searchFilter.setUserUU(1000002503L);
@@ -128,7 +129,7 @@ public class InquiryForBuyerTest extends BaseJunitTest {
      * /quotation
      */
     @Test
-    public void quotation() throws Exception {
+    public void testFindQuotationById() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("id", 9L);
         HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/buyer/quotation", params);
@@ -139,7 +140,7 @@ public class InquiryForBuyerTest extends BaseJunitTest {
      * /save
      */
     @Test
-    public void saveInquiry() throws Exception {
+    public void testSaveInquiry() throws Exception {
         PurcInquiry inquiry = new PurcInquiry();
         inquiry.setEndDate(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 2));
         inquiry.setRecorderUU(1000002503L);
@@ -170,7 +171,7 @@ public class InquiryForBuyerTest extends BaseJunitTest {
      * /decide
      */
     @Test
-    public void decide() throws Exception {
+    public void testDecideQuote() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("id", 9L);
         params.put("status", Constant.YES);
@@ -184,7 +185,7 @@ public class InquiryForBuyerTest extends BaseJunitTest {
      * /adopt
      */
     @Test
-    public void adopt() throws Exception {
+    public void testAdoptQuote() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("id", 9L);
         params.put("status", Constant.YES);
@@ -198,7 +199,7 @@ public class InquiryForBuyerTest extends BaseJunitTest {
      * /refuse
      */
     @Test
-    public void refuse() throws Exception {
+    public void testRefuseQuote() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("id", 9L);
         params.put("status", Constant.NO);

src/test/java/com/uas/ps/inquiry/InquiryForSalerTest.java → src/test/java/com/uas/ps/inquiry/controller/InquiryForSalerControllerTest.java

@@ -1,6 +1,7 @@
-package com.uas.ps.inquiry;
+package com.uas.ps.inquiry.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.uas.ps.inquiry.BaseJunitTest;
 import com.uas.ps.inquiry.model.PublicInquiry;
 import com.uas.ps.inquiry.model.PublicInquiryItem;
 import com.uas.ps.inquiry.model.PublicInquiryReply;
@@ -19,7 +20,7 @@ import java.util.List;
  * @since 2018年9月26日
  */
 
-public class InquiryForSalerTest extends BaseJunitTest {
+public class InquiryForSalerControllerTest extends BaseJunitTest {
 
     /**
      * localhost
@@ -47,7 +48,7 @@ public class InquiryForSalerTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void saveQuote() throws Exception {
+    public void testSaveQuote() throws Exception {
         PublicInquiry inquiry = new PublicInquiry();
         inquiry.setId(1225L);
         inquiry.setEnUU(enUU);
@@ -85,7 +86,7 @@ public class InquiryForSalerTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void inquiryDetail() throws Exception {
+    public void testFindById() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         // 报价明细Id
         params.put("itemId", 1225);
@@ -100,7 +101,7 @@ public class InquiryForSalerTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void publciInquiryDetail() throws Exception {
+    public void testFindInquiryById() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         // 询价明细Id
         params.put("id", 1169);
@@ -114,7 +115,7 @@ public class InquiryForSalerTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void remind() throws Exception {
+    public void testFindByUserInfo() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         // 询价明细Id
         params.put("useruu", userUU);
@@ -133,7 +134,7 @@ public class InquiryForSalerTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void enremind() throws Exception {
+    public void testFindEnRemind() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         // 询价明细Id
         params.put("useruu", userUU);

src/test/java/com/uas/ps/inquiry/PublicApiTest.java → src/test/java/com/uas/ps/inquiry/controller/PublicApiControllerTest.java

@@ -1,6 +1,7 @@
-package com.uas.ps.inquiry;
+package com.uas.ps.inquiry.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.uas.ps.inquiry.BaseJunitTest;
 import com.uas.ps.inquiry.util.HttpUtil;
 import org.junit.Test;
 
@@ -11,7 +12,7 @@ import java.util.HashMap;
  * @since 2018年9月26日
  */
 
-public class PublicApiTest extends BaseJunitTest {
+public class PublicApiControllerTest extends BaseJunitTest {
 
     /**
      * localhost
@@ -38,7 +39,7 @@ public class PublicApiTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void sumPersonalPublish() throws Exception {
+    public void testSumPersonalPublish() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("useruu", userUU);
         params.put("enuu", enUU);
@@ -53,7 +54,7 @@ public class PublicApiTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void sumEnterprisePublish() throws Exception {
+    public void testSumEnterprisePublish() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("enuu", enUU);
         params.put("starttime", System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 2);
@@ -67,7 +68,7 @@ public class PublicApiTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void sumPersonalReply() throws Exception {
+    public void testSumPersonalReply() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("useruu", userUU);
         params.put("enuu", enUU);
@@ -82,7 +83,7 @@ public class PublicApiTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void sumEnterpriseReply() throws Exception {
+    public void testSumEnterpriseReply() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("enuu", enUU);
         params.put("starttime", System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 2);
@@ -96,7 +97,7 @@ public class PublicApiTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void sumPublishWithTime() throws Exception {
+    public void testSumRecentPublishWithTime() throws Exception {
         HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/api/sum/all/time?time=" + System.currentTimeMillis(), null);
         System.out.println(JSON.toJSON(res));
     }
@@ -107,7 +108,7 @@ public class PublicApiTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void sumPublishWithTimeScope() throws Exception {
+    public void testSumPublishWithTimeScope() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("starttime", System.currentTimeMillis() - 1000 * 60 * 60 * 24 * 7);
         params.put("endtime", System.currentTimeMillis());

src/test/java/com/uas/ps/inquiry/PublicInquiryTest.java → src/test/java/com/uas/ps/inquiry/controller/PublicInquiryControllerTest.java

@@ -1,6 +1,7 @@
-package com.uas.ps.inquiry;
+package com.uas.ps.inquiry.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.uas.ps.inquiry.BaseJunitTest;
 import com.uas.ps.inquiry.entity.Constant;
 import com.uas.ps.inquiry.page.PageInfo;
 import com.uas.ps.inquiry.page.SearchFilter;
@@ -17,7 +18,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
  * @author dongbw
  * @since 2018年9月27日
  */
-public class PublicInquiryTest extends BaseJunitTest {
+public class PublicInquiryControllerTest extends BaseJunitTest {
 
     /**
      * localhost
@@ -43,7 +44,7 @@ public class PublicInquiryTest extends BaseJunitTest {
      * /
      */
     @Test
-    public void publicInquiry() throws Exception {
+    public void testGetInquiry() throws Exception {
         SearchFilter searchFilter = new SearchFilter();
         searchFilter.setEnUU(1001166L);
         searchFilter.setUserUU(1000002503L);
@@ -60,7 +61,7 @@ public class PublicInquiryTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void inquiryList() throws Exception {
+    public void testGetInquiryList() throws Exception {
         SearchFilter searchFilter = new SearchFilter();
         searchFilter.setEnUU(1001166L);
         searchFilter.setUserUU(1000002503L);
@@ -77,7 +78,7 @@ public class PublicInquiryTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void quotationList() throws Exception {
+    public void testGetQuotation() throws Exception {
         SearchFilter filter = new SearchFilter();
         filter.setEnUU(1001166L);
         filter.setUserUU(1000002503L);
@@ -96,7 +97,7 @@ public class PublicInquiryTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void quotationOne() throws Exception {
+    public void testGetQuotationById() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("id", 223L);
         params.put("useruu", userUU);
@@ -110,7 +111,7 @@ public class PublicInquiryTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void quotationLists() throws Exception {
+    public void testGetQuotationList() throws Exception {
         SearchFilter filter = new SearchFilter();
         filter.setEnUU(1001166L);
         filter.setUserUU(1000002503L);
@@ -132,7 +133,7 @@ public class PublicInquiryTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void messageList() throws Exception {
+    public void testGetList() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("size", 20);
         params.put("enuu", enUU);
@@ -145,7 +146,7 @@ public class PublicInquiryTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void findInquiryById() throws Exception {
+    public void testFindById() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("id", 20L);
         params.put("enuu", enUU);
@@ -159,7 +160,7 @@ public class PublicInquiryTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void findCodeRankingList() throws Exception {
+    public void testFindCodeRankingList() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/findCodeRankingList", null);
         System.out.println(FlexJsonUtils.toJson(res));
@@ -170,7 +171,7 @@ public class PublicInquiryTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void findItemByItemId() throws Exception {
+    public void testFindItemByItemId() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("itemId", 1220L);
         params.put("enuu", enUU);
@@ -183,7 +184,7 @@ public class PublicInquiryTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void getPurcInquiryItemCountByMonth() throws Exception {
+    public void testGetPurcInquiryItemCountByMonth() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("year", 2018);
         params.put("month", 9);
@@ -196,7 +197,7 @@ public class PublicInquiryTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void getCountOfLastAndThisMonth() throws Exception {
+    public void testGetCountOfLastAndThisMonth() throws Exception {
         HttpUtil.Response res = HttpUtil.sendGetRequest(localhost + "/inquiry/public/getCountOfLastAndThisMonth", null);
         System.out.println(FlexJsonUtils.toJson(res));
     }
@@ -206,7 +207,7 @@ public class PublicInquiryTest extends BaseJunitTest {
      * @throws Exception
      */
     @Test
-    public void deleteItem() throws Exception {
+    public void testDeleteItems() throws Exception {
         HashMap<String, Object> params = new HashMap<>();
         params.put("id", 1220);
         params.put("valid", Constant.NO);