From 0b40522e936c521e121afc2e0f7bb31ddd294674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= Date: Sat, 5 Sep 2020 16:35:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=BB=98=E8=AE=A4=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/celess/blog/controller/VisitorController.java | 2 +- .../cn/celess/blog/controller/VisitorControllerTest.java | 2 ++ .../VisitorServiceImplTest.java => VisitorServiceTest.java} | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) rename src/test/java/cn/celess/blog/service/{serviceimpl/VisitorServiceImplTest.java => VisitorServiceTest.java} (85%) diff --git a/src/main/java/cn/celess/blog/controller/VisitorController.java b/src/main/java/cn/celess/blog/controller/VisitorController.java index 8a965f9..a0fdb00 100644 --- a/src/main/java/cn/celess/blog/controller/VisitorController.java +++ b/src/main/java/cn/celess/blog/controller/VisitorController.java @@ -27,7 +27,7 @@ public class VisitorController { @GetMapping("/admin/visitor/page") public Response page(@RequestParam(value = "count", required = false, defaultValue = "10") int count, @RequestParam(value = "page", required = false, defaultValue = "1") int page, - @RequestParam(value = "showLocation", required = false, defaultValue = "false") boolean showLocation) { + @RequestParam(value = "showLocation", required = false, defaultValue = "true") boolean showLocation) { return Response.success(visitorService.visitorPage(page, count, showLocation)); } diff --git a/src/test/java/cn/celess/blog/controller/VisitorControllerTest.java b/src/test/java/cn/celess/blog/controller/VisitorControllerTest.java index 76c97e6..10b5da8 100644 --- a/src/test/java/cn/celess/blog/controller/VisitorControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/VisitorControllerTest.java @@ -31,6 +31,7 @@ public class VisitorControllerTest extends BaseTest { public void page() throws Exception { int count = 10; int page = 1; + // 默认显示location getMockData(get("/admin/visitor/page?count=" + count + "&page=" + page), adminLogin()).andDo(result -> { Response> response = getResponse(result, VISITOR_PAGE_TYPE); assertEquals(SUCCESS.getCode(), response.getCode()); @@ -41,6 +42,7 @@ public class VisitorControllerTest extends BaseTest { for (VisitorModel v : pageData.getList()) { assertNotEquals(0, v.getId()); assertNotNull(v.getDate()); + assertNotNull(v.getLocation()); } }); } diff --git a/src/test/java/cn/celess/blog/service/serviceimpl/VisitorServiceImplTest.java b/src/test/java/cn/celess/blog/service/VisitorServiceTest.java similarity index 85% rename from src/test/java/cn/celess/blog/service/serviceimpl/VisitorServiceImplTest.java rename to src/test/java/cn/celess/blog/service/VisitorServiceTest.java index ec99d85..9c1a7b2 100644 --- a/src/test/java/cn/celess/blog/service/serviceimpl/VisitorServiceImplTest.java +++ b/src/test/java/cn/celess/blog/service/VisitorServiceTest.java @@ -1,16 +1,15 @@ -package cn.celess.blog.service.serviceimpl; +package cn.celess.blog.service; import cn.celess.blog.BaseTest; import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.model.VisitorModel; -import cn.celess.blog.service.VisitorService; import com.alibaba.druid.util.StringUtils; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import static org.junit.Assert.*; -public class VisitorServiceImplTest extends BaseTest { +public class VisitorServiceTest extends BaseTest { @Autowired VisitorService visitorService;