diff --git a/pom.xml b/pom.xml index d887c36..6c87937 100644 --- a/pom.xml +++ b/pom.xml @@ -76,14 +76,6 @@ compile - - - net.sf.json-lib - json-lib - 2.4 - jdk15 - - com.qiniu diff --git a/src/main/java/cn/celess/blog/configuration/filter/AuthenticationFilter.java b/src/main/java/cn/celess/blog/configuration/filter/AuthenticationFilter.java index 71b28aa..d25f662 100644 --- a/src/main/java/cn/celess/blog/configuration/filter/AuthenticationFilter.java +++ b/src/main/java/cn/celess/blog/configuration/filter/AuthenticationFilter.java @@ -5,7 +5,7 @@ import cn.celess.blog.entity.Response; import cn.celess.blog.service.UserService; import cn.celess.blog.util.JwtUtil; import cn.celess.blog.util.RedisUtil; -import net.sf.json.JSONObject; +import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -84,7 +84,7 @@ public class AuthenticationFilter implements HandlerInterceptor { response.setHeader("Content-Type", "application/json;charset=UTF-8"); try { logger.info("鉴权失败，[code:{},msg:{},path:{}]", e.getCode(), e.getMsg(), request.getRequestURI() + "?" + request.getQueryString()); - response.getWriter().println(JSONObject.fromObject(Response.response(e, null))); + response.getWriter().println(new ObjectMapper().writeValueAsString(Response.response(e, null))); } catch (IOException ex) { ex.printStackTrace(); } diff --git a/src/main/java/cn/celess/blog/controller/ArticleController.java b/src/main/java/cn/celess/blog/controller/ArticleController.java index 7889fba..e611d94 100644 --- a/src/main/java/cn/celess/blog/controller/ArticleController.java +++ b/src/main/java/cn/celess/blog/controller/ArticleController.java @@ -3,17 +3,15 @@ package cn.celess.blog.controller; import cn.celess.blog.enmu.ResponseEnum; import cn.celess.blog.entity.Response; import cn.celess.blog.entity.model.ArticleModel; -import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.request.ArticleReq; import cn.celess.blog.service.ArticleService; import cn.celess.blog.util.RedisUserUtil; import cn.celess.blog.util.SitemapGenerateUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.stream.Collectors; /** * @author : xiaohai @@ -27,6 +25,8 @@ public class ArticleController { SitemapGenerateUtil sitemapGenerateUtil; @Autowired RedisUserUtil redisUserUtil; + @Value("${spring.profiles.active}") + private String activeModel; /** * 新建一篇文章 @@ -37,7 +37,9 @@ public class ArticleController { @PostMapping("/admin/article/create") public Response create(@RequestBody ArticleReq body) { ArticleModel articleModel = articleService.create(body); - sitemapGenerateUtil.createSitemap(); + if ("prod".equals(activeModel)) { + sitemapGenerateUtil.createSitemap(); + } return Response.success(articleModel); } @@ -50,7 +52,9 @@ public class ArticleController { @DeleteMapping("/admin/article/del") public Response delete(@RequestParam("articleID") long articleId) { boolean delete = articleService.delete(articleId); - sitemapGenerateUtil.createSitemap(); + if ("prod".equals(activeModel)) { + sitemapGenerateUtil.createSitemap(); + } return Response.success(delete); } @@ -63,7 +67,9 @@ public class ArticleController { @PutMapping("/admin/article/update") public Response update(@RequestBody ArticleReq body) { ArticleModel update = articleService.update(body); - sitemapGenerateUtil.createSitemap(); + if ("prod".equals(activeModel)) { + sitemapGenerateUtil.createSitemap(); + } return Response.success(update); } diff --git a/src/main/java/cn/celess/blog/controller/CommonController.java b/src/main/java/cn/celess/blog/controller/CommonController.java index 902ffb6..bde8b32 100644 --- a/src/main/java/cn/celess/blog/controller/CommonController.java +++ b/src/main/java/cn/celess/blog/controller/CommonController.java @@ -9,8 +9,8 @@ import cn.celess.blog.service.QiniuService; import cn.celess.blog.util.HttpUtil; import cn.celess.blog.util.RedisUtil; import cn.celess.blog.util.VeriCodeUtil; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -138,7 +138,8 @@ public class CommonController { */ @PostMapping("/imgUpload") public void upload(HttpServletRequest request, HttpServletResponse response, @RequestParam("editormd-image-file") MultipartFile file) throws IOException { - JSONObject jsonObject = new JSONObject(); + Map map = new HashMap<>(); + ObjectMapper mapper = new ObjectMapper(); String uploadTimesStr = redisUtil.get(request.getRemoteAddr() + "-ImgUploadTimes"); int uploadTimes = 0; if (uploadTimesStr != null) { @@ -148,11 +149,11 @@ public class CommonController { throw new MyException(ResponseEnum.FAILURE.getCode(), "上传次数已达10次，请2小时后在上传"); } request.setCharacterEncoding("utf-8"); - response.setContentType("text/html"); + response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE); if (file.isEmpty()) { - jsonObject.put("success", 0); - jsonObject.put("message", "上传失败，请选择文件"); - response.getWriter().println(jsonObject.toString()); + map.put("success", 0); + map.put("message", "上传失败，请选择文件"); + response.getWriter().println(mapper.writeValueAsString(map)); return; } String fileName = file.getOriginalFilename(); @@ -161,25 +162,28 @@ public class CommonController { if (".png".equals(mime.toLowerCase()) || ".jpg".equals(mime.toLowerCase()) || ".jpeg".equals(mime.toLowerCase()) || ".bmp".equals(mime.toLowerCase())) { QiniuResponse qiniuResponse = qiniuService.uploadFile(file.getInputStream(), "img_" + System.currentTimeMillis() + mime); - jsonObject.put("success", 1); - jsonObject.put("message", "上传成功"); - jsonObject.put("url", "http://cdn.celess.cn/" + qiniuResponse.key); - response.getWriter().println(jsonObject.toString()); + map.put("success", 1); + map.put("message", "上传成功"); + map.put("url", "http://cdn.celess.cn/" + qiniuResponse.key); + response.getWriter().println(mapper.writeValueAsString(map)); redisUtil.setEx(request.getRemoteAddr() + "-ImgUploadTimes", uploadTimes + 1 + "", 2, TimeUnit.HOURS); return; } - jsonObject.put("success", 0); - jsonObject.put("message", "上传失败，请上传图片文件"); - response.getWriter().println(jsonObject.toString()); + map.put("success", 0); + map.put("message", "上传失败，请上传图片文件"); + response.getWriter().println(mapper.writeValueAsString(map)); } @GetMapping("/bingPic") public Response bingPic() { - - JSONObject imageObj; - imageObj = JSONObject.fromObject(HttpUtil.get("https://cn.bing.com/HPImageArchive.aspx?format=js&idx=0&n=1&mkt=zh-CN")); - JSONArray jsonArray = imageObj.getJSONArray("images"); - String imageName = jsonArray.getJSONObject(0).getString("url"); - return Response.success("https://cn.bing.com" + imageName); + ObjectMapper mapper = new ObjectMapper(); + JsonNode root; + try { + root = mapper.readTree(HttpUtil.get("https://cn.bing.com/HPImageArchive.aspx?format=js&idx=0&n=1&mkt=zh-CN")); + } catch (IOException e) { + return Response.failure(null); + } + JsonNode images = root.get("images").elements().next(); + return Response.success("https://cn.bing.com" + images.get("url").asText()); } } diff --git a/src/main/java/cn/celess/blog/controller/LinksController.java b/src/main/java/cn/celess/blog/controller/LinksController.java index fb5b599..1375acc 100644 --- a/src/main/java/cn/celess/blog/controller/LinksController.java +++ b/src/main/java/cn/celess/blog/controller/LinksController.java @@ -1,24 +1,18 @@ package cn.celess.blog.controller; -import cn.celess.blog.enmu.ResponseEnum; import cn.celess.blog.entity.PartnerSite; import cn.celess.blog.entity.Response; import cn.celess.blog.entity.request.LinkApplyReq; import cn.celess.blog.entity.request.LinkReq; -import cn.celess.blog.exception.MyException; import cn.celess.blog.service.MailService; import cn.celess.blog.service.PartnerSiteService; -import cn.celess.blog.util.DateFormatUtil; import cn.celess.blog.util.RedisUtil; -import cn.celess.blog.util.RegexUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.mail.SimpleMailMessage; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.TimeUnit; /** * @author : xiaohai diff --git a/src/main/java/cn/celess/blog/controller/TagController.java b/src/main/java/cn/celess/blog/controller/TagController.java index 95abe06..b09e0c8 100644 --- a/src/main/java/cn/celess/blog/controller/TagController.java +++ b/src/main/java/cn/celess/blog/controller/TagController.java @@ -3,12 +3,13 @@ package cn.celess.blog.controller; import cn.celess.blog.entity.Response; import cn.celess.blog.entity.model.TagModel; import cn.celess.blog.service.TagService; -import net.sf.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @author : xiaohai @@ -44,13 +45,13 @@ public class TagController { @GetMapping("/tags/nac") public Response getTagNameAndCount() { - List nameAndCount = new ArrayList<>(); + List> nameAndCount = new ArrayList<>(); List all = tagService.findAll(); for (TagModel t : all) { - JSONObject jsonObject = new JSONObject(); - jsonObject.put("name", t.getName()); - jsonObject.put("size", t.getArticles().size()); - nameAndCount.add(jsonObject); + Map map = new HashMap<>(2); + map.put("name", t.getName()); + map.put("size", t.getArticles().size()); + nameAndCount.add(map); } return Response.success(nameAndCount); } diff --git a/src/main/java/cn/celess/blog/entity/Response.java b/src/main/java/cn/celess/blog/entity/Response.java index 7630696..6f35606 100644 --- a/src/main/java/cn/celess/blog/entity/Response.java +++ b/src/main/java/cn/celess/blog/entity/Response.java @@ -1,8 +1,9 @@ package cn.celess.blog.entity; import cn.celess.blog.enmu.ResponseEnum; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.Data; -import net.sf.json.JSONObject; +import lombok.SneakyThrows; import java.io.Serializable; @@ -56,9 +57,9 @@ public class Response implements Serializable { return new Response(r.getCode(), r.getMsg(), result); } + @SneakyThrows @Override public String toString() { - JSONObject jsonObject = JSONObject.fromObject(this); - return jsonObject.toString(); + return new ObjectMapper().writeValueAsString(this); } } diff --git a/src/main/java/cn/celess/blog/entity/request/LoginReq.java b/src/main/java/cn/celess/blog/entity/request/LoginReq.java index d0f8813..0ea98c1 100644 --- a/src/main/java/cn/celess/blog/entity/request/LoginReq.java +++ b/src/main/java/cn/celess/blog/entity/request/LoginReq.java @@ -1,12 +1,16 @@ package cn.celess.blog.entity.request; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * @author : xiaohai * @date : 2019/06/01 22:47 */ @Data +@NoArgsConstructor +@AllArgsConstructor public class LoginReq { private String email; private String password; diff --git a/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java b/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java index 7e86124..3973598 100644 --- a/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java +++ b/src/main/java/cn/celess/blog/service/WebUpdateInfoService.java @@ -2,10 +2,10 @@ package cn.celess.blog.service; import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.model.WebUpdateModel; -import net.sf.json.JSONObject; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * @author : xiaohai @@ -59,5 +59,5 @@ public interface WebUpdateInfoService { * * @return */ - JSONObject getLastestUpdateTime(); + Map getLastestUpdateTime(); } diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java index b5e9c9a..ed7d788 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java @@ -22,7 +22,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import sun.security.krb5.internal.PAData; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java index af49b48..0e790fe 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java @@ -10,14 +10,13 @@ import cn.celess.blog.mapper.PartnerMapper; import cn.celess.blog.service.MailService; import cn.celess.blog.service.PartnerSiteService; import cn.celess.blog.util.HttpUtil; -import cn.celess.blog.util.JwtUtil; import cn.celess.blog.util.RedisUtil; import cn.celess.blog.util.RegexUtil; +import com.alibaba.druid.util.StringUtils; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.SneakyThrows; -import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mail.SimpleMailMessage; diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java index 10bc0b0..2899599 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java @@ -17,8 +17,6 @@ import cn.celess.blog.service.UserService; import cn.celess.blog.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -28,9 +26,7 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; import java.beans.Transient; import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; +import java.util.*; import java.util.concurrent.TimeUnit; /** @@ -312,14 +308,14 @@ public class UserServiceImpl implements UserService { @Override public Object deleteUser(Integer[] id) { - JSONArray status = new JSONArray(); + List> status = new ArrayList<>(); if (id == null || id.length == 0) { return null; } for (Integer integer : id) { String role = userMapper.getRoleById(integer); int deleteResult = 0; - JSONObject deleteStatus = new JSONObject(); + Map deleteStatus = new HashMap<>(3); deleteStatus.put("id", integer); // 管理员账户不可删 if ("admin".equals(role)) { diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/VisitorServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/VisitorServiceImpl.java index dbfac93..b37d5ba 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/VisitorServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/VisitorServiceImpl.java @@ -15,7 +15,6 @@ import eu.bitwalker.useragentutils.Browser; import eu.bitwalker.useragentutils.OperatingSystem; import eu.bitwalker.useragentutils.UserAgent; import eu.bitwalker.useragentutils.Version; -import org.apache.commons.lang.time.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.json.JsonParserFactory; import org.springframework.stereotype.Service; @@ -26,6 +25,8 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import java.time.LocalDateTime; +import java.time.temporal.ChronoUnit; import java.util.*; import java.util.concurrent.TimeUnit; @@ -67,8 +68,9 @@ public class VisitorServiceImpl implements VisitorService { visitor.setUa(request.getHeader("User-Agent")); //记录当日的访问 String dayVisitCount = redisUtil.get("dayVisitCount"); - long secondsLeftToday = 86400 - DateUtils.getFragmentInSeconds(Calendar.getInstance(), Calendar.DATE); - Date date = new Date(Calendar.YEAR); + + LocalDateTime midnight = LocalDateTime.now().plusDays(1).withHour(0).withMinute(0).withSecond(0).withNano(0); + long secondsLeftToday = ChronoUnit.SECONDS.between(LocalDateTime.now(), midnight); if (dayVisitCount == null) { redisUtil.setEx("dayVisitCount", "1", secondsLeftToday, TimeUnit.SECONDS); } else { diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java index 640daad..ce51248 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java @@ -1,109 +1,115 @@ -package cn.celess.blog.service.serviceimpl; - -import cn.celess.blog.enmu.ResponseEnum; -import cn.celess.blog.entity.WebUpdate; -import cn.celess.blog.entity.model.PageData; -import cn.celess.blog.entity.model.WebUpdateModel; -import cn.celess.blog.exception.MyException; -import cn.celess.blog.mapper.WebUpdateInfoMapper; -import cn.celess.blog.service.WebUpdateInfoService; -import cn.celess.blog.util.DateFormatUtil; -import cn.celess.blog.util.HttpUtil; -import cn.celess.blog.util.ModalTrans; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import lombok.extern.slf4j.Slf4j; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.time.Instant; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * @author : xiaohai - * @date : 2019/05/12 11:43 - */ -@Service -@Slf4j -public class WebUpdateInfoServiceImpl implements WebUpdateInfoService { - @Autowired - WebUpdateInfoMapper webUpdateInfoMapper; - - - @Override - public WebUpdateModel create(String info) { - if (info == null || info.replaceAll(" ", "").isEmpty()) { - throw new MyException(ResponseEnum.PARAMETERS_ERROR); - } - WebUpdate webUpdate = new WebUpdate(info); - if (webUpdateInfoMapper.insert(webUpdate) == 0) { - throw new MyException(ResponseEnum.FAILURE); - } - return ModalTrans.webUpdate(webUpdateInfoMapper.findById(webUpdate.getId())); - } - - @Override - public Boolean del(long id) { - if (!webUpdateInfoMapper.existsById(id)) { - throw new MyException(ResponseEnum.DATA_NOT_EXIST); - } - return webUpdateInfoMapper.delete(id) == 1; - } - - @Override - public WebUpdateModel update(long id, String info) { - WebUpdate webUpdate = webUpdateInfoMapper.findById(id); - if (webUpdate == null) { - throw new MyException(ResponseEnum.DATA_NOT_EXIST); - } - if (info == null || info.replaceAll(" ", "").isEmpty()) { - throw new MyException(ResponseEnum.PARAMETERS_ERROR); - } - webUpdate.setUpdateInfo(info); - webUpdateInfoMapper.update(id, info); - return ModalTrans.webUpdate(webUpdate); - } - - @Override - public PageData pages(int count, int page) { - PageHelper.startPage(page, count); - List updateList = webUpdateInfoMapper.findAll(); - return new PageData(new PageInfo(updateList), list2List(updateList)); - } - - @Override - public List findAll() { - List all = webUpdateInfoMapper.findAll(); - return list2List(all); - } - - @Override - public JSONObject getLastestUpdateTime() { - JSONObject jsonObject = new JSONObject(); - jsonObject.put("lastUpdateTime", DateFormatUtil.get(webUpdateInfoMapper.getLastestOne().getUpdateTime())); - jsonObject.put("lastUpdateInfo", webUpdateInfoMapper.getLastestOne().getUpdateInfo()); - String str = HttpUtil.get("https://api.github.com/repos/xiaohai2271/blog-frontEnd/commits?page=1&per_page=1"); - if (!StringUtils.isEmpty(str)) { - JSONArray array = JSONArray.fromObject(str); - JSONObject object = array.getJSONObject(0); - JSONObject commit = object.getJSONObject("commit"); - jsonObject.put("lastCommit", commit.getString("message")); - jsonObject.put("committerAuthor", commit.getJSONObject("committer").getString("name")); - Instant parse = Instant.parse(commit.getJSONObject("committer").getString("date")); - jsonObject.put("committerDate", DateFormatUtil.get(Date.from(parse))); - jsonObject.put("commitUrl", "https://github.com/xiaohai2271/blog-frontEnd/tree/" + object.getString("sha")); - } - return jsonObject; - } - - private List list2List(List webUpdates) { - List webUpdateModels = new ArrayList<>(); - webUpdates.forEach(update -> webUpdateModels.add(ModalTrans.webUpdate(update))); - return webUpdateModels; - } -} +package cn.celess.blog.service.serviceimpl; + +import cn.celess.blog.enmu.ResponseEnum; +import cn.celess.blog.entity.WebUpdate; +import cn.celess.blog.entity.model.PageData; +import cn.celess.blog.entity.model.WebUpdateModel; +import cn.celess.blog.exception.MyException; +import cn.celess.blog.mapper.WebUpdateInfoMapper; +import cn.celess.blog.service.WebUpdateInfoService; +import cn.celess.blog.util.DateFormatUtil; +import cn.celess.blog.util.HttpUtil; +import cn.celess.blog.util.ModalTrans; +import com.alibaba.druid.util.StringUtils; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.time.Instant; +import java.util.*; + +/** + * @author : xiaohai + * @date : 2019/05/12 11:43 + */ +@Service +@Slf4j +public class WebUpdateInfoServiceImpl implements WebUpdateInfoService { + @Autowired + WebUpdateInfoMapper webUpdateInfoMapper; + + + @Override + public WebUpdateModel create(String info) { + if (info == null || info.replaceAll(" ", "").isEmpty()) { + throw new MyException(ResponseEnum.PARAMETERS_ERROR); + } + WebUpdate webUpdate = new WebUpdate(info); + if (webUpdateInfoMapper.insert(webUpdate) == 0) { + throw new MyException(ResponseEnum.FAILURE); + } + return ModalTrans.webUpdate(webUpdateInfoMapper.findById(webUpdate.getId())); + } + + @Override + public Boolean del(long id) { + if (!webUpdateInfoMapper.existsById(id)) { + throw new MyException(ResponseEnum.DATA_NOT_EXIST); + } + return webUpdateInfoMapper.delete(id) == 1; + } + + @Override + public WebUpdateModel update(long id, String info) { + WebUpdate webUpdate = webUpdateInfoMapper.findById(id); + if (webUpdate == null) { + throw new MyException(ResponseEnum.DATA_NOT_EXIST); + } + if (info == null || info.replaceAll(" ", "").isEmpty()) { + throw new MyException(ResponseEnum.PARAMETERS_ERROR); + } + webUpdate.setUpdateInfo(info); + webUpdateInfoMapper.update(id, info); + return ModalTrans.webUpdate(webUpdate); + } + + @Override + public PageData pages(int count, int page) { + PageHelper.startPage(page, count); + List updateList = webUpdateInfoMapper.findAll(); + return new PageData(new PageInfo(updateList), list2List(updateList)); + } + + @Override + public List findAll() { + List all = webUpdateInfoMapper.findAll(); + return list2List(all); + } + + @Override + + public Map getLastestUpdateTime() { + Map map = new HashMap<>(); + map.put("lastUpdateTime", DateFormatUtil.get(webUpdateInfoMapper.getLastestOne().getUpdateTime())); + map.put("lastUpdateInfo", webUpdateInfoMapper.getLastestOne().getUpdateInfo()); + try { + ObjectMapper mapper = new ObjectMapper(); + String respStr = HttpUtil.get("https://api.github.com/repos/xiaohai2271/blog-frontEnd/commits?page=1&per_page=1"); + if (!StringUtils.isEmpty(respStr)) { + JsonNode root = mapper.readTree(respStr); + Iterator elements = root.elements(); + JsonNode next = elements.next(); + JsonNode commit = next.get("commit"); + map.put("lastCommit", commit.get("message")); + map.put("committerAuthor", commit.get("committer").get("name")); + Instant parse = Instant.parse(commit.get("committer").get("date").asText()); + map.put("committerDate", DateFormatUtil.get(Date.from(parse))); + map.put("commitUrl", "https://github.com/xiaohai2271/blog-frontEnd/tree/" + next.get("sha").asText()); + } + } catch (IOException e) { + log.info("网络请求失败{}", e.getMessage()); + } + return map; + } + + private List list2List(List webUpdates) { + List webUpdateModels = new ArrayList<>(); + webUpdates.forEach(update -> webUpdateModels.add(ModalTrans.webUpdate(update))); + return webUpdateModels; + } +} diff --git a/src/main/java/cn/celess/blog/util/RedisUserUtil.java b/src/main/java/cn/celess/blog/util/RedisUserUtil.java index a161ad7..3233998 100644 --- a/src/main/java/cn/celess/blog/util/RedisUserUtil.java +++ b/src/main/java/cn/celess/blog/util/RedisUserUtil.java @@ -3,7 +3,8 @@ package cn.celess.blog.util; import cn.celess.blog.enmu.ResponseEnum; import cn.celess.blog.entity.User; import cn.celess.blog.exception.MyException; -import net.sf.json.JSONObject; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.SneakyThrows; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -31,24 +32,27 @@ public class RedisUserUtil { return user; } + @SneakyThrows public User getWithOutExc() { String token = request.getHeader("Authorization"); if (token == null || token.isEmpty()) { return null; } String email = jwtUtil.getUsernameFromToken(token); - return (User) JSONObject.toBean(JSONObject.fromObject(redisUtil.get(email + "-login")), User.class); + return new ObjectMapper().readValue(redisUtil.get(email + "-login"), User.class); } + @SneakyThrows public User set(User user) { Long expire = redisUtil.getExpire(user.getEmail() + "-login"); - redisUtil.setEx(user.getEmail() + "-login", JSONObject.fromObject(user).toString(), + redisUtil.setEx(user.getEmail() + "-login", new ObjectMapper().writeValueAsString(user), expire > 0 ? expire : JwtUtil.EXPIRATION_SHORT_TIME, TimeUnit.MILLISECONDS); return user; } + @SneakyThrows public User set(User user, boolean isRemember) { - redisUtil.setEx(user.getEmail() + "-login", JSONObject.fromObject(user).toString(), + redisUtil.setEx(user.getEmail() + "-login", new ObjectMapper().writeValueAsString(user), isRemember ? JwtUtil.EXPIRATION_LONG_TIME : JwtUtil.EXPIRATION_SHORT_TIME, TimeUnit.MILLISECONDS); request.getSession().setAttribute("email", user.getEmail()); return user; diff --git a/src/test/java/cn/celess/blog/BaseTest.java b/src/test/java/cn/celess/blog/BaseTest.java index d11b223..20a6603 100644 --- a/src/test/java/cn/celess/blog/BaseTest.java +++ b/src/test/java/cn/celess/blog/BaseTest.java @@ -1,344 +1,347 @@ -package cn.celess.blog; - - -import cn.celess.blog.entity.Response; -import cn.celess.blog.entity.model.QiniuResponse; -import cn.celess.blog.entity.model.UserModel; -import cn.celess.blog.entity.request.LoginReq; -import cn.celess.blog.service.MailService; -import cn.celess.blog.service.QiniuService; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.qiniu.storage.model.FileInfo; -import lombok.extern.slf4j.Slf4j; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.http.MediaType; -import org.springframework.mail.SimpleMailMessage; -import org.springframework.mock.web.MockHttpSession; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.ResultActions; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; -import org.springframework.web.context.WebApplicationContext; - - -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.lang.reflect.Field; -import java.util.Map; -import java.util.UUID; - -import static cn.celess.blog.enmu.ResponseEnum.SUCCESS; -import static org.junit.Assert.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -/** - * @Author: 小海 - * @Date: 2019/08/22 12:46 - * @Description: 测试基类 - */ -@SpringBootTest -@RunWith(SpringRunner.class) -@WebAppConfiguration -@ActiveProfiles("test") -public class BaseTest { - - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - protected MockMvc mockMvc; - protected final static String Code = "code"; - protected final static String Result = "result"; - /** - * jackson 序列化/反序列化Json - */ - protected final ObjectMapper mapper = new ObjectMapper(); - protected static final TypeReference BOOLEAN_TYPE = new TypeReference>() { - }; - protected static final TypeReference STRING_TYPE = new TypeReference>() { - }; - protected static final TypeReference OBJECT_TYPE = new TypeReference>() { - }; - protected static final TypeReference MAP_OBJECT_TYPE = new TypeReference>>() { - }; - @Autowired - private WebApplicationContext wac; - protected MockHttpSession session; - - @Before - public void before() { - this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); - session = new MockHttpSession(); - System.out.println("==========> 开始测试 <========="); - } - - @After - public void after() { - System.out.println("==========> 测试结束 <========="); - } - - /** - * 　admin 权限用户登录 - * - * @return token - */ - protected String adminLogin() { - LoginReq req = new LoginReq(); - req.setEmail("a@celess.cn"); - req.setPassword("123456789"); - req.setIsRememberMe(true); - String token = login(req); - assertNotNull(token); - return token; - } - - /** - * user 权限用户登录 - * - * @return token - */ - protected String userLogin() { - LoginReq req = new LoginReq(); - req.setEmail("zh56462271@qq.com"); - req.setPassword("123456789"); - req.setIsRememberMe(true); - String token = login(req); - assertNotNull(token); - return token; - } - - /** - * 登录逻辑 - * - * @param req 用户信息 - * @return token | null - */ - private String login(LoginReq req) { - String str = null; - try { - str = getMockData(post("/login"), null, req) - .andReturn().getResponse().getContentAsString(); - Response response = mapper.readValue(str, new TypeReference>() { - }); - assertEquals(SUCCESS.getCode(), response.getCode()); - String token = response.getResult().getToken(); - assertNotNull(token); - return token; - } catch (Exception e) { - logger.error("测试登录错误"); - e.printStackTrace(); - } - assertNotNull(str); - return null; - } - - @Test - public void test() { - // 测试登录 - assertNotNull(userLogin()); - assertNotNull(adminLogin()); - assertNotEquals(userLogin(), adminLogin()); - try { - // 测试getMockData方法 - assertNotNull(getMockData(get("/headerInfo"))); - getMockData((get("/headerInfo"))).andDo(result -> assertNotNull(getResponse(result, OBJECT_TYPE))); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * 产生指定长度的随机字符 - * - * @param len len - * @return str - */ - protected String randomStr(int len) { - return UUID.randomUUID().toString().replaceAll("-", "").substring(0, len); - } - - /** - * 产生指定长度的随机字符 - * - * @return str - */ - protected String randomStr() { - return UUID.randomUUID().toString(); - } - - /** - * 抽离的mock请求方法 - * - * @param builder MockHttpServletRequestBuilder ：get(...) post(...) .... - * @return 返回 ResultActions - * @throws Exception exc - */ - protected ResultActions getMockData(MockHttpServletRequestBuilder builder) throws Exception { - return getMockData(builder, null, null); - } - - /** - * 抽离的mock请求方法 重载 - * - * @param builder .. - * @param token 用户登录的token - * @return .. - * @throws Exception .. - */ - protected ResultActions getMockData(MockHttpServletRequestBuilder builder, String token) throws Exception { - return getMockData(builder, token, null); - } - - /** - * 抽离的mock请求方法 重载 - * - * @param builder .. - * @param token .. - * @param content http中发送的APPLICATION_JSON的json数据 - * @return .. - * @throws Exception .. - */ - protected ResultActions getMockData(MockHttpServletRequestBuilder builder, String token, Object content) throws Exception { - // MockHttpServletRequestBuilder mockHttpServletRequestBuilder = get(url); - if (token != null) { - builder.header("Authorization", token); - } - if (content != null) { - builder.content(mapper.writeValueAsString(content)).contentType(MediaType.APPLICATION_JSON); - } - return mockMvc.perform(builder).andExpect(status().isOk()); - } - - - protected Response getResponse(String json) { - return getResponse(json, OBJECT_TYPE); - } - - protected Response getResponse(MvcResult result) { - return getResponse(result, OBJECT_TYPE); - } - - /** - * 根据json 信息反序列化成Response对象 - * - * @param json json - * @param 泛型 - * @return Response对象 - */ - protected Response getResponse(String json, TypeReference responseType) { - Response response = null; - System.out.println(responseType.getType()); - try { - response = mapper.readValue(json, responseType); - } catch (IOException e) { - logger.error("解析json Response对象错误，json:[{}]", json); - e.printStackTrace(); - } - assertNotNull(response); - return response; - } - - /** - * 根据json 信息反序列化成Response对象 - * - * @param result MvcResult - * @param 泛型 - * @return Response对象 - */ - protected Response getResponse(MvcResult result, TypeReference responseType) { - try { - return getResponse(result.getResponse().getContentAsString(), responseType); - } catch (UnsupportedEncodingException e) { - logger.error("解析json Response对象错误，result:[{}]", result); - e.printStackTrace(); - } - return null; - } - - - /** - * 修改 mailService 的实现类 - * - * @param service service 类 - * @param mailFiledName service 中自动注入的mailService字段名 - */ - protected void mockInjectInstance(Object service, String mailFiledName, Object impl) { - Field field; - try { - field = service.getClass().getDeclaredField(mailFiledName); - field.setAccessible(true); - field.set(service, impl); - } catch (NoSuchFieldException | IllegalAccessException e) { - e.printStackTrace(); - } - } - - - @Slf4j - public static class TestMailServiceImpl implements MailService { - - @Override - public Boolean AsyncSend(SimpleMailMessage message) { - log.debug("异步邮件请求,SimpleMailMessage:[{}]", getJson(message)); - return true; - } - - @Override - public Boolean send(SimpleMailMessage message) { - log.debug("邮件请求,SimpleMailMessage:[{}]", getJson(message)); - return true; - } - - /** - * 转json - * - * @param o - * @return - */ - private String getJson(Object o) { - ObjectMapper mapper = new ObjectMapper(); - try { - return mapper.writeValueAsString(o); - } catch (JsonProcessingException e) { - return null; - } - } - } - - @Slf4j - public static class TestQiNiuServiceImpl implements QiniuService { - @Override - public QiniuResponse uploadFile(InputStream is, String fileName) { - QiniuResponse response = new QiniuResponse(); - log.debug("上传文件请求，[fileName:{}]", fileName); - - response.key = "key"; - response.bucket = "bucket"; - response.hash = "hash"; - response.fsize = 1; - return response; - } - - @Override - public FileInfo[] getFileList() { - log.debug("获取文件列表请求"); - return new FileInfo[0]; - } - } - -} +package cn.celess.blog; + + +import cn.celess.blog.entity.Response; +import cn.celess.blog.entity.model.QiniuResponse; +import cn.celess.blog.entity.model.UserModel; +import cn.celess.blog.entity.request.LoginReq; +import cn.celess.blog.service.MailService; +import cn.celess.blog.service.QiniuService; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.qiniu.storage.model.FileInfo; +import lombok.extern.slf4j.Slf4j; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.MediaType; +import org.springframework.mail.SimpleMailMessage; +import org.springframework.mock.web.MockHttpSession; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.MvcResult; +import org.springframework.test.web.servlet.ResultActions; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.context.WebApplicationContext; + +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.lang.reflect.Field; +import java.util.Map; +import java.util.UUID; + +import static cn.celess.blog.enmu.ResponseEnum.SUCCESS; +import static org.junit.Assert.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +/** + * @Author: 小海 + * @Date: 2019/08/22 12:46 + * @Description: 测试基类 + */ +@SpringBootTest +@RunWith(SpringRunner.class) +@WebAppConfiguration +@ActiveProfiles("test") +public class BaseTest { + + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + protected MockMvc mockMvc; + protected final static String Code = "code"; + protected final static String Result = "result"; + protected final static String USERE_MAIL = "zh56462271@qq.com"; + protected final static String ADMIN_EMAIL = "a@celess.cn"; + + /** + * jackson 序列化/反序列化Json + */ + protected final ObjectMapper mapper = new ObjectMapper(); + protected static final TypeReference BOOLEAN_TYPE = new TypeReference>() { + }; + protected static final TypeReference STRING_TYPE = new TypeReference>() { + }; + protected static final TypeReference OBJECT_TYPE = new TypeReference>() { + }; + protected static final TypeReference MAP_OBJECT_TYPE = new TypeReference>>() { + }; + + @Autowired + private WebApplicationContext wac; + protected MockHttpSession session; + + @Before + public void before() { + this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); + session = new MockHttpSession(); + System.out.println("==========> 开始测试 <========="); + } + + @After + public void after() { + System.out.println("==========> 测试结束 <========="); + } + + /** + * 　admin 权限用户登录 + * + * @return token + */ + protected String adminLogin() { + LoginReq req = new LoginReq(); + req.setEmail(ADMIN_EMAIL); + req.setPassword("123456789"); + req.setIsRememberMe(true); + String token = login(req); + assertNotNull(token); + return token; + } + + /** + * user 权限用户登录 + * + * @return token + */ + protected String userLogin() { + LoginReq req = new LoginReq(); + req.setEmail(USERE_MAIL); + req.setPassword("123456789"); + req.setIsRememberMe(true); + String token = login(req); + assertNotNull(token); + return token; + } + + /** + * 登录逻辑 + * + * @param req 用户信息 + * @return token | null + */ + protected String login(LoginReq req) { + String str = null; + try { + str = getMockData(post("/login"), null, req) + .andReturn().getResponse().getContentAsString(); + Response response = mapper.readValue(str, new TypeReference>() { + }); + assertEquals(SUCCESS.getCode(), response.getCode()); + String token = response.getResult().getToken(); + assertNotNull(token); + return token; + } catch (Exception e) { + logger.error("测试登录错误"); + e.printStackTrace(); + } + assertNotNull(str); + return null; + } + + @Test + public void test() { + // 测试登录 + assertNotNull(userLogin()); + assertNotNull(adminLogin()); + assertNotEquals(userLogin(), adminLogin()); + try { + // 测试getMockData方法 + assertNotNull(getMockData(get("/headerInfo"))); + getMockData((get("/headerInfo"))).andDo(result -> assertNotNull(getResponse(result, OBJECT_TYPE))); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 产生指定长度的随机字符 + * + * @param len len + * @return str + */ + protected String randomStr(int len) { + return UUID.randomUUID().toString().replaceAll("-", "").substring(0, len); + } + + /** + * 产生指定长度的随机字符 + * + * @return str + */ + protected String randomStr() { + return UUID.randomUUID().toString(); + } + + /** + * 抽离的mock请求方法 + * + * @param builder MockHttpServletRequestBuilder ：get(...) post(...) .... + * @return 返回 ResultActions + * @throws Exception exc + */ + protected ResultActions getMockData(MockHttpServletRequestBuilder builder) throws Exception { + return getMockData(builder, null, null); + } + + /** + * 抽离的mock请求方法 重载 + * + * @param builder .. + * @param token 用户登录的token + * @return .. + * @throws Exception .. + */ + protected ResultActions getMockData(MockHttpServletRequestBuilder builder, String token) throws Exception { + return getMockData(builder, token, null); + } + + /** + * 抽离的mock请求方法 重载 + * + * @param builder .. + * @param token .. + * @param content http中发送的APPLICATION_JSON的json数据 + * @return .. + * @throws Exception .. + */ + protected ResultActions getMockData(MockHttpServletRequestBuilder builder, String token, Object content) throws Exception { + // MockHttpServletRequestBuilder mockHttpServletRequestBuilder = get(url); + if (token != null) { + builder.header("Authorization", token); + } + if (content != null) { + builder.content(mapper.writeValueAsString(content)).contentType(MediaType.APPLICATION_JSON); + logger.debug("param::json->{}", mapper.writeValueAsString(content)); + } + return mockMvc.perform(builder).andExpect(status().isOk()); + } + + + protected Response getResponse(String json) { + return getResponse(json, OBJECT_TYPE); + } + + protected Response getResponse(MvcResult result) { + return getResponse(result, OBJECT_TYPE); + } + + /** + * 根据json 信息反序列化成Response对象 + * + * @param json json + * @param 泛型 + * @return Response对象 + */ + protected Response getResponse(String json, TypeReference responseType) { + Response response = null; + try { + response = mapper.readValue(json, responseType); + } catch (IOException e) { + logger.error("解析json Response对象错误，json:[{}]", json); + e.printStackTrace(); + } + assertNotNull(response); + return response; + } + + /** + * 根据json 信息反序列化成Response对象 + * + * @param result MvcResult + * @param 泛型 + * @return Response对象 + */ + protected Response getResponse(MvcResult result, TypeReference responseType) { + try { + return getResponse(result.getResponse().getContentAsString(), responseType); + } catch (UnsupportedEncodingException e) { + logger.error("解析json Response对象错误，result:[{}]", result); + e.printStackTrace(); + } + return null; + } + + + /** + * 修改 mailService 的实现类 + * + * @param service service 类 + * @param mailFiledName service 中自动注入的mailService字段名 + */ + protected void mockInjectInstance(Object service, String mailFiledName, Object impl) { + Field field; + try { + assertNotNull(service); + field = service.getClass().getDeclaredField(mailFiledName); + field.setAccessible(true); + field.set(service, impl); + } catch (NoSuchFieldException | IllegalAccessException e) { + e.printStackTrace(); + } + } + + + @Slf4j + public static class TestMailServiceImpl implements MailService { + + @Override + public Boolean AsyncSend(SimpleMailMessage message) { + log.debug("异步邮件请求,SimpleMailMessage:[{}]", getJson(message)); + return true; + } + + @Override + public Boolean send(SimpleMailMessage message) { + log.debug("邮件请求,SimpleMailMessage:[{}]", getJson(message)); + return true; + } + + /** + * 转json + * + * @param o + * @return + */ + private String getJson(Object o) { + ObjectMapper mapper = new ObjectMapper(); + try { + return mapper.writeValueAsString(o); + } catch (JsonProcessingException e) { + return null; + } + } + } + + @Slf4j + public static class TestQiNiuServiceImpl implements QiniuService { + @Override + public QiniuResponse uploadFile(InputStream is, String fileName) { + QiniuResponse response = new QiniuResponse(); + log.debug("上传文件请求，[fileName:{}]", fileName); + + response.key = "key"; + response.bucket = "bucket"; + response.hash = "hash"; + response.fsize = 1; + return response; + } + + @Override + public FileInfo[] getFileList() { + log.debug("获取文件列表请求"); + return new FileInfo[0]; + } + } +} diff --git a/src/test/java/cn/celess/blog/RedisServerMock.java b/src/test/java/cn/celess/blog/RedisServerMock.java index ec1df6f..009afa1 100644 --- a/src/test/java/cn/celess/blog/RedisServerMock.java +++ b/src/test/java/cn/celess/blog/RedisServerMock.java @@ -1,7 +1,7 @@ package cn.celess.blog; -import redis.embedded.RedisServer; import org.springframework.stereotype.Component; +import redis.embedded.RedisServer; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; diff --git a/src/test/java/cn/celess/blog/controller/ArticleControllerTest.java b/src/test/java/cn/celess/blog/controller/ArticleControllerTest.java index fe0a7cb..d63d8a7 100644 --- a/src/test/java/cn/celess/blog/controller/ArticleControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/ArticleControllerTest.java @@ -9,29 +9,30 @@ import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.request.ArticleReq; import cn.celess.blog.mapper.ArticleMapper; import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import net.sf.json.JSONObject; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import java.util.List; -import java.util.*; - +import static cn.celess.blog.enmu.ResponseEnum.*; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static cn.celess.blog.enmu.ResponseEnum.*; public class ArticleControllerTest extends BaseTest { @Autowired ArticleMapper articleMapper; + private static final TypeReference ARTICLE_MODEL_TYPE = new TypeReference>() { + }; + private static final TypeReference ARTICLE_MODEL_PAGE_TYPE = new TypeReference>>() { + }; @Test public void create() { ArticleReq articleReq = new ArticleReq(); // 应该正常通过 - articleReq.setTitle("test-" + UUID.randomUUID().toString()); + articleReq.setTitle("test-" + randomStr()); articleReq.setMdContent("# test title"); articleReq.setCategory("随笔"); String[] tagList = {"tag", "category"}; @@ -39,58 +40,29 @@ public class ArticleControllerTest extends BaseTest { articleReq.setOpen(true); articleReq.setType(true); articleReq.setUrl("http://xxxx.com"); - JSONObject jsonObject = JSONObject.fromObject(articleReq); + MockHttpServletRequestBuilder post = post("/admin/article/create"); try { - // 未登录 - mockMvc.perform(post("/admin/article/create") - .content(jsonObject.toString()) - .contentType("application/json")) - .andExpect(status().isOk()) - .andDo(result -> { - assertEquals(HAVE_NOT_LOG_IN.getCode(), - JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code) - ); - }); - // User权限 - String token = userLogin(); - mockMvc.perform(post("/admin/article/create") - .content(jsonObject.toString()) - .contentType("application/json") - .header("Authorization", token)) - .andExpect(status().isOk()) - .andDo(result -> { - assertEquals(PERMISSION_ERROR.getCode(), - JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code) - ); - }); - - // Admin权限 - token = adminLogin(); - mockMvc.perform(post("/admin/article/create") - .content(jsonObject.toString()) - .contentType("application/json") - .header("Authorization", token)) - .andExpect(status().isOk()) - .andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - ArticleModel articleModel = (ArticleModel) JSONObject.toBean(object.getJSONObject(Result), ArticleModel.class); - assertNotNull(articleModel.getId()); - assertNotNull(articleModel.getTitle()); - assertNotNull(articleModel.getSummary()); - assertNotNull(articleModel.getOriginal()); - assertNotNull(articleModel.getTags()); - assertNotNull(articleModel.getCategory()); - assertNotNull(articleModel.getPublishDateFormat()); - assertNotNull(articleModel.getMdContent()); - assertNotNull(articleModel.getPreArticle()); - assertNull(articleModel.getNextArticle()); - assertNotNull(articleModel.getOpen()); - assertNotNull(articleModel.getReadingNumber()); - assertNotNull(articleModel.getAuthor()); - assertNotNull(articleModel.getUrl()); - }); + getMockData(post, adminLogin(), articleReq).andDo(result -> { + Response response = getResponse(result, ARTICLE_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertNotNull(response.getResult()); + ArticleModel articleModel = response.getResult(); + assertNotNull(articleModel.getId()); + assertNotNull(articleModel.getTitle()); + assertNotNull(articleModel.getSummary()); + assertNotNull(articleModel.getOriginal()); + assertNotNull(articleModel.getTags()); + assertNotNull(articleModel.getCategory()); + assertNotNull(articleModel.getPublishDateFormat()); + assertNotNull(articleModel.getMdContent()); + assertNotNull(articleModel.getPreArticle()); + assertNull(articleModel.getNextArticle()); + assertNotNull(articleModel.getOpen()); + assertNotNull(articleModel.getReadingNumber()); + assertNotNull(articleModel.getAuthor()); + assertNotNull(articleModel.getUrl()); + }); } catch (Exception e) { e.printStackTrace(); } @@ -98,33 +70,22 @@ public class ArticleControllerTest extends BaseTest { @Test public void delete() { - Article article = articleMapper.getLastestArticle(); - + Article article; + do { + article = articleMapper.getLastestArticle(); + create(); + } while (article.isDeleted()); + assertFalse(article.isDeleted()); + MockHttpServletRequestBuilder delete = MockMvcRequestBuilders.delete("/admin/article/del?articleID=" + article.getId()); try { - // 未登录删除文章 - mockMvc.perform(MockMvcRequestBuilders.delete("/admin/article/del?articleID=" + article.getId()) - ).andDo(result -> { - assertEquals(HAVE_NOT_LOG_IN.getCode(), - JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code) - ); + Article finalArticle = article; + getMockData(delete, adminLogin()).andDo(result -> { + Response response = getResponse(result, BOOLEAN_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + // 断言删除成功 + assertTrue(response.getResult()); + assertTrue(articleMapper.isDeletedById(finalArticle.getId())); }); - // user 权限删除文章 - String token = userLogin(); - mockMvc.perform(MockMvcRequestBuilders.delete("/admin/article/del?articleID=" + article.getId()) - .header("Authorization", token)) - .andDo(result -> assertEquals(PERMISSION_ERROR.getCode(), - JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)) - ); - // admin 权限删除文章 - token = adminLogin(); - mockMvc.perform(MockMvcRequestBuilders.delete("/admin/article/del?articleID=" + article.getId()) - .header("Authorization", token)) - .andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - // 断言删除成功 - assertTrue(object.getBoolean(Result)); - }); } catch (Exception e) { e.printStackTrace(); } @@ -146,27 +107,21 @@ public class ArticleControllerTest extends BaseTest { articleReq.setTags(tagList); articleReq.setTitle("test-" + article.getTitle()); try { - // Admin 权限 - mockMvc.perform(put("/admin/article/update") - .content(JSONObject.fromObject(articleReq).toString()) - .contentType("application/json") - .header("Authorization", adminLogin())) - .andExpect(status().isOk()) - .andDo(result -> { - JSONObject jsonObject = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), jsonObject.getInt(Code)); - ArticleModel a = (ArticleModel) JSONObject.toBean(jsonObject.getJSONObject(Result), ArticleModel.class); - assertEquals(articleReq.getCategory(), a.getCategory()); - assertEquals(articleReq.getUrl(), a.getUrl()); - assertEquals(articleReq.getMdContent(), a.getMdContent()); - assertEquals(articleReq.getTitle(), a.getTitle()); - assertEquals(articleReq.getType(), a.getOriginal()); - // Tag - List asList = a.getTags(); - assertEquals(3, asList.size()); - assertEquals(articleReq.getOpen(), a.getOpen()); - assertEquals(articleReq.getId(), a.getId()); - }); + getMockData(put("/admin/article/update"), adminLogin(), articleReq).andDo(result -> { + Response response = getResponse(result, ARTICLE_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + ArticleModel a = response.getResult(); + assertEquals(articleReq.getCategory(), a.getCategory()); + assertEquals(articleReq.getUrl(), a.getUrl()); + assertEquals(articleReq.getMdContent(), a.getMdContent()); + assertEquals(articleReq.getTitle(), a.getTitle()); + assertEquals(articleReq.getType(), a.getOriginal()); + // Tag + List asList = a.getTags(); + assertEquals(3, asList.size()); + assertEquals(articleReq.getOpen(), a.getOpen()); + assertEquals(articleReq.getId(), a.getId()); + }); } catch (Exception e) { e.printStackTrace(); } @@ -176,43 +131,35 @@ public class ArticleControllerTest extends BaseTest { public void retrieveOneById() { try { long articleID = 3; - mockMvc.perform(MockMvcRequestBuilders.get("/article/articleID/" + articleID)) - .andExpect(status().is(200)); - mockMvc.perform(MockMvcRequestBuilders.get("/article/articleID/" + articleID + "?update=true")) - .andExpect(status().is(200)); + getMockData(MockMvcRequestBuilders.get("/article/articleID/" + articleID)); + getMockData(MockMvcRequestBuilders.get("/article/articleID/" + articleID + "?update=true")); // 文章不存在 - mockMvc.perform(MockMvcRequestBuilders.get("/article/articleID/-1")) - .andExpect(status().is(200)) - .andDo(result -> { - JSONObject jsonObject = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(ARTICLE_NOT_EXIST.getCode(), jsonObject.getInt(Code)); - }); + getMockData(MockMvcRequestBuilders.get("/article/articleID/-1")) + .andDo(result -> assertEquals(ARTICLE_NOT_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode())); // 正常情况 - mockMvc.perform(MockMvcRequestBuilders.get("/article/articleID/" + articleID + "?update=false")) - .andExpect(status().is(200)) - .andDo(result -> { - JSONObject articleJson = JSONObject.fromObject(result.getResponse().getContentAsString()); - // 断言获取数据成功 - assertEquals(SUCCESS.getCode(), articleJson.getInt(Code)); - assertNotNull(articleJson.getJSONObject(Result)); + getMockData(MockMvcRequestBuilders.get("/article/articleID/" + articleID + "?update=false")).andDo(result -> { + Response response = getResponse(result, ARTICLE_MODEL_TYPE); + // 断言获取数据成功 + assertEquals(SUCCESS.getCode(), response.getCode()); + assertNotNull(response.getResult()); - ArticleModel a = (ArticleModel) JSONObject.toBean(articleJson.getJSONObject(Result), ArticleModel.class); - assertNotNull(a.getTitle()); - assertNotNull(a.getId()); - assertNotNull(a.getSummary()); - assertNotNull(a.getMdContent()); - assertNotNull(a.getUrl()); - assertNotNull(a.getUpdateDateFormat()); - assertTrue(a.getPreArticle() != null || a.getNextArticle() != null); - assertNotNull(a.getReadingNumber()); - assertNotNull(a.getOriginal()); - assertNotNull(a.getPublishDateFormat()); - assertNotNull(a.getCategory()); - assertNotNull(a.getTags()); - assertNotNull(a.getAuthor()); - }); + ArticleModel a = response.getResult(); + assertNotNull(a.getTitle()); + assertNotNull(a.getId()); + assertNotNull(a.getSummary()); + assertNotNull(a.getMdContent()); + assertNotNull(a.getUrl()); + assertNotNull(a.getUpdateDateFormat()); + assertTrue(a.getPreArticle() != null || a.getNextArticle() != null); + assertNotNull(a.getReadingNumber()); + assertNotNull(a.getOriginal()); + assertNotNull(a.getPublishDateFormat()); + assertNotNull(a.getCategory()); + assertNotNull(a.getTags()); + assertNotNull(a.getAuthor()); + }); } catch (Exception e) { e.printStackTrace(); } @@ -222,39 +169,32 @@ public class ArticleControllerTest extends BaseTest { public void articles() { try { // 测试不带参数访问 - mockMvc.perform(MockMvcRequestBuilders.get("/articles")) - .andExpect(status().is(200)); - - mockMvc.perform(MockMvcRequestBuilders.get("/articles?page=1&count=5")) - .andExpect(status().is(200)) - .andDo(result -> { - JSONObject articlesJSON = JSONObject.fromObject(result.getResponse().getContentAsString()); - Response response = (Response) JSONObject.toBean(articlesJSON, Response.class); - // 断言获取数据成功 - assertEquals(SUCCESS.getCode(), response.getCode()); - // 结果集非空 - assertNotNull(response.getResult()); - // 判断pageInfo是否包装完全 - JSONObject resultJson = JSONObject.fromObject(response.getResult()); - PageData pageData = (PageData) JSONObject.toBean(resultJson, PageData.class); - assertNotEquals(0, pageData.getTotal()); - assertEquals(1, pageData.getPageNum()); - assertEquals(5, pageData.getPageSize()); - // 内容完整 - for (Object arc : pageData.getList()) { - ArticleModel a = (ArticleModel) JSONObject.toBean(JSONObject.fromObject(arc), ArticleModel.class); - assertNotNull(a.getTitle()); - assertNotNull(a.getId()); - assertNotNull(a.getSummary()); - assertNotNull(a.getOriginal()); - assertNotNull(a.getPublishDateFormat()); - assertNotNull(a.getCategory()); - assertNotNull(a.getTags()); - assertNotNull(a.getAuthor()); - assertNull(a.getOpen()); - assertNull(a.getMdContent()); - } - }); + getMockData(MockMvcRequestBuilders.get("/articles")); + getMockData(MockMvcRequestBuilders.get("/articles?page=1&count=5")).andDo(result -> { + Response> response = getResponse(result, ARTICLE_MODEL_PAGE_TYPE); + // 断言获取数据成功 + assertEquals(SUCCESS.getCode(), response.getCode()); + // 结果集非空 + assertNotNull(response.getResult()); + // 判断pageInfo是否包装完全 + PageData pageData = response.getResult(); + assertNotEquals(0, pageData.getTotal()); + assertEquals(1, pageData.getPageNum()); + assertEquals(5, pageData.getPageSize()); + // 内容完整 + for (ArticleModel a : pageData.getList()) { + assertNotNull(a.getTitle()); + assertNotNull(a.getId()); + assertNotNull(a.getSummary()); + assertNotNull(a.getOriginal()); + assertNotNull(a.getPublishDateFormat()); + assertNotNull(a.getCategory()); + assertNotNull(a.getTags()); + assertNotNull(a.getAuthor()); + assertNull(a.getOpen()); + assertNull(a.getMdContent()); + } + }); } catch (Exception e) { e.printStackTrace(); } @@ -264,19 +204,18 @@ public class ArticleControllerTest extends BaseTest { public void adminArticles() { try { getMockData(get("/admin/articles?page=1&count=10")).andExpect(result -> - assertEquals(HAVE_NOT_LOG_IN.getCode(), mapper.readValue(result.getResponse().getContentAsString(), Response.class).getCode()) + assertEquals(HAVE_NOT_LOG_IN.getCode(), getResponse(result, STRING_TYPE).getCode()) ); // User权限登陆 getMockData(get("/admin/articles?page=1&count=10"), userLogin()).andDo(result -> - assertEquals(PERMISSION_ERROR.getCode(), mapper.readValue(result.getResponse().getContentAsString(), Response.class).getCode()) + assertEquals(PERMISSION_ERROR.getCode(), getResponse(result, STRING_TYPE).getCode()) ); for (int i = 0; i < 2; i++) { // admin权限登陆 int finalI = i; getMockData(get("/admin/articles?page=1&count=10&deleted=" + (i == 1)), adminLogin()).andDo(result -> { - Response> response = mapper.readValue(result.getResponse().getContentAsString(), new TypeReference>>() { - }); + Response> response = getResponse(result, ARTICLE_MODEL_PAGE_TYPE); assertEquals(SUCCESS.getCode(), response.getCode()); assertNotNull(response.getResult()); // 判断pageInfo是否包装完全 @@ -309,27 +248,22 @@ public class ArticleControllerTest extends BaseTest { try { // 分类不存在 String categoryName = "NoSuchCategory"; - mockMvc.perform(MockMvcRequestBuilders.get("/articles/category/" + categoryName + "?page=1&count=10")) - .andExpect(status().is(200)) - .andDo(result -> { - assertEquals(CATEGORY_NOT_EXIST.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); - }); + getMockData(MockMvcRequestBuilders.get("/articles/category/" + categoryName + "?page=1&count=10")) + .andDo(result -> assertEquals(CATEGORY_NOT_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode())); // 正常查询 categoryName = "linux"; - mockMvc.perform(MockMvcRequestBuilders.get("/articles/category/" + categoryName + "?page=1&count=10")) - .andExpect(status().is(200)) + getMockData(MockMvcRequestBuilders.get("/articles/category/" + categoryName + "?page=1&count=10")) .andDo(result -> { - JSONObject jsonObject = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), jsonObject.getInt(Code)); - PageData pageData = (PageData) JSONObject.toBean(jsonObject.getJSONObject(Result), PageData.class); + Response> response = getResponse(result, ARTICLE_MODEL_PAGE_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + PageData pageData = response.getResult(); assertNotEquals(0, pageData.getTotal()); assertEquals(1, pageData.getPageNum()); assertEquals(10, pageData.getPageSize()); - for (Object arc : pageData.getList()) { - JSONObject jsonObject1 = JSONObject.fromObject(arc); - assertNotEquals(0, jsonObject1.getInt("id")); - assertNotNull(jsonObject1.getString("title")); - assertNotNull(jsonObject1.getString("summary")); + for (ArticleModel arc : pageData.getList()) { + assertNotEquals(0, arc.getId().longValue()); + assertNotNull(arc.getTitle()); + assertNotNull(arc.getSummary()); } }); } catch (Exception e) { @@ -342,28 +276,23 @@ public class ArticleControllerTest extends BaseTest { try { // 分类不存在 String tagName = "NoSuchTag"; - mockMvc.perform(MockMvcRequestBuilders.get("/articles/tag/" + tagName + "?page=1&count=10")) - .andExpect(status().is(200)) - .andDo(result -> { - assertEquals(TAG_NOT_EXIST.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); - }); + getMockData(MockMvcRequestBuilders.get("/articles/tag/" + tagName + "?page=1&count=10")) + .andDo(result -> assertEquals(TAG_NOT_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode())); // 正常查询 tagName = "linux"; - mockMvc.perform(MockMvcRequestBuilders.get("/articles/tag/" + tagName + "?page=1&count=10")) - .andExpect(status().is(200)) + getMockData(MockMvcRequestBuilders.get("/articles/tag/" + tagName + "?page=1&count=10")) .andDo(result -> { - JSONObject jsonObject = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), jsonObject.getInt(Code)); - PageData pageData = (PageData) JSONObject.toBean(jsonObject.getJSONObject(Result), PageData.class); + Response> response = getResponse(result, ARTICLE_MODEL_PAGE_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + PageData pageData = response.getResult(); assertNotEquals(0, pageData.getTotal()); assertEquals(1, pageData.getPageNum()); assertEquals(10, pageData.getPageSize()); - for (Object arc : pageData.getList()) { - JSONObject jsonObject1 = JSONObject.fromObject(arc); - assertNotEquals(0, jsonObject1.getInt("id")); - assertNotNull(jsonObject1.getString("title")); - assertNotNull(jsonObject1.getString("summary")); + for (ArticleModel arc : pageData.getList()) { + assertNotEquals(0, arc.getId().longValue()); + assertNotNull(arc.getTitle()); + assertNotNull(arc.getSummary()); } }); } catch (Exception e) { diff --git a/src/test/java/cn/celess/blog/controller/CategoryControllerTest.java b/src/test/java/cn/celess/blog/controller/CategoryControllerTest.java index 1615756..cb5e78c 100644 --- a/src/test/java/cn/celess/blog/controller/CategoryControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/CategoryControllerTest.java @@ -2,132 +2,77 @@ package cn.celess.blog.controller; import cn.celess.blog.BaseTest; import cn.celess.blog.entity.Category; +import cn.celess.blog.entity.Response; import cn.celess.blog.entity.model.CategoryModel; +import cn.celess.blog.entity.model.PageData; import cn.celess.blog.mapper.CategoryMapper; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; +import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import java.util.UUID; - +import static cn.celess.blog.enmu.ResponseEnum.SUCCESS; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static cn.celess.blog.enmu.ResponseEnum.*; public class CategoryControllerTest extends BaseTest { @Autowired CategoryMapper categoryMapper; + private static final TypeReference CATEGORY_MODEL_TYPE = new TypeReference>() { + }; + private static final TypeReference CATEGORY_MODEL_PAGE_TYPE = new TypeReference>>() { + }; @Test public void addOne() throws Exception { String categoryName = randomStr(4); - System.out.println("categoryName: ==> " + categoryName); - // 未登录 - mockMvc.perform(post("/admin/category/create?name=" + categoryName)).andExpect(status().isOk()) - .andDo(result -> { - assertEquals(HAVE_NOT_LOG_IN.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); - }); - // User权限 - String token = userLogin(); - mockMvc.perform(post("/admin/category/create?name=" + categoryName) - .header("Authorization", token)) - .andExpect(status().isOk()) - .andDo(result -> { - assertEquals(PERMISSION_ERROR.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); - }); - // Admin权限 - token = adminLogin(); - mockMvc.perform(post("/admin/category/create?name=" + categoryName) - .header("Authorization", token)) - .andExpect(status().isOk()) - .andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - CategoryModel category = (CategoryModel) JSONObject.toBean(object.getJSONObject(Result), CategoryModel.class); - assertEquals(categoryName, category.getName()); - assertNotNull(category.getId()); - assertNotEquals(0, category.getArticles()); - }); + getMockData(post("/admin/category/create?name=" + categoryName), adminLogin()).andDo(result -> { + Response response = getResponse(result, CATEGORY_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + CategoryModel category = response.getResult(); + assertEquals(categoryName, category.getName()); + assertNotNull(category.getId()); + assertNotEquals(0, category.getArticles()); + }); } @Test public void deleteOne() throws Exception { Category category = categoryMapper.getLastestCategory(); - // 未登录 - mockMvc.perform(delete("/admin/category/del?id=" + category.getId())).andExpect(status().isOk()) - .andDo(result -> { - assertEquals(HAVE_NOT_LOG_IN.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); - }); - // User权限 - String token = userLogin(); - mockMvc.perform(delete("/admin/category/del?id=" + category.getId()) - .header("Authorization", token)) - .andExpect(status().isOk()) - .andDo(result -> { - assertEquals(PERMISSION_ERROR.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); - }); - // Admin权限 - token = adminLogin(); - mockMvc.perform(delete("/admin/category/del?id=" + category.getId()) - .header("Authorization", token)) - .andExpect(status().isOk()) - .andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - assertTrue(object.getBoolean(Result)); - }); + getMockData(delete("/admin/category/del?id=" + category.getId()), adminLogin()).andDo(result -> { + Response response = getResponse(result, BOOLEAN_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertTrue(response.getResult()); + }); } @Test public void updateOne() throws Exception { Category category = categoryMapper.getLastestCategory(); String name = randomStr(4); - // 未登录 - mockMvc.perform(put("/admin/category/update?id=" + category.getId() + "&name=" + name)).andExpect(status().isOk()) - .andDo(result -> { - assertEquals(HAVE_NOT_LOG_IN.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); - }); - // User权限 - String token = userLogin(); - mockMvc.perform(put("/admin/category/update?id=" + category.getId() + "&name=" + name) - .header("Authorization", token)) - .andExpect(status().isOk()) - .andDo(result -> { - assertEquals(PERMISSION_ERROR.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); - }); - // Admin权限 - token = adminLogin(); - mockMvc.perform(put("/admin/category/update?id=" + category.getId() + "&name=" + name) - .header("Authorization", token)) - .andExpect(status().isOk()) - .andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - CategoryModel c = (CategoryModel) JSONObject.toBean(object.getJSONObject(Result), CategoryModel.class); - assertEquals(name, c.getName()); - assertNotEquals(0, c.getArticles()); - assertNotNull(c.getId()); - }); + getMockData(put("/admin/category/update?id=" + category.getId() + "&name=" + name), adminLogin()).andDo(result -> { + // Response response = mapper.readValue(result.getResponse().getContentAsString(), new ResponseType>()); + Response response = getResponse(result, CATEGORY_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + CategoryModel c = response.getResult(); + assertEquals(name, c.getName()); + assertNotEquals(0, c.getArticles()); + assertNotNull(c.getId()); + }); } @Test public void getPage() throws Exception { - mockMvc.perform(get("/categories")).andExpect(status().isOk()) - .andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - JSONArray jsonArray = object.getJSONObject(Result).getJSONArray("list"); - assertNotNull(jsonArray); - jsonArray.forEach(o -> { - CategoryModel c = (CategoryModel) JSONObject.toBean(JSONObject.fromObject(o), CategoryModel.class); - assertNotNull(c.getName()); - assertNotNull(c.getId()); - assertNotEquals(0, c.getArticles()); - }); - }); + getMockData(get("/categories")).andDo(result -> { + Response> response = getResponse(result, CATEGORY_MODEL_PAGE_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertNotNull(response.getResult()); + response.getResult().getList().forEach(c -> { + assertNotNull(c.getName()); + assertNotNull(c.getId()); + assertNotEquals(0, c.getArticles()); + }); + }); } } \ No newline at end of file diff --git a/src/test/java/cn/celess/blog/controller/CommentControllerTest.java b/src/test/java/cn/celess/blog/controller/CommentControllerTest.java index 19df58b..dcafc2c 100644 --- a/src/test/java/cn/celess/blog/controller/CommentControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/CommentControllerTest.java @@ -3,21 +3,22 @@ package cn.celess.blog.controller; import cn.celess.blog.BaseTest; import cn.celess.blog.entity.Article; import cn.celess.blog.entity.Comment; +import cn.celess.blog.entity.Response; import cn.celess.blog.entity.User; import cn.celess.blog.entity.model.CommentModel; import cn.celess.blog.entity.request.CommentReq; import cn.celess.blog.mapper.ArticleMapper; import cn.celess.blog.mapper.CommentMapper; import cn.celess.blog.mapper.UserMapper; -import net.sf.json.JSONObject; +import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import java.util.UUID; +import java.util.List; +import static cn.celess.blog.enmu.ResponseEnum.DATA_IS_DELETED; +import static cn.celess.blog.enmu.ResponseEnum.SUCCESS; import static org.junit.Assert.*; -import static cn.celess.blog.enmu.ResponseEnum.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; public class CommentControllerTest extends BaseTest { @@ -27,46 +28,40 @@ public class CommentControllerTest extends BaseTest { UserMapper userMapper; @Autowired CommentMapper commentMapper; + private static final TypeReference COMMENT_MODEL_TYPE = new TypeReference>() { + }; @Test public void addOne() throws Exception { Article article = articleMapper.getLastestArticle(); CommentReq commentReq = new CommentReq(); commentReq.setPagePath("/article/" + article.getId()); - commentReq.setContent(UUID.randomUUID().toString()); - commentReq.setPid(-1L); - commentReq.setToUserId(-1L); - String token = userLogin(); - mockMvc.perform(post("/user/comment/create") - .contentType(MediaType.APPLICATION_JSON_UTF8) - .content(JSONObject.fromObject(commentReq).toString()) - .header("Authorization", token) - ).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - CommentModel model = (CommentModel) JSONObject.toBean(object.getJSONObject(Result), CommentModel.class); + commentReq.setContent(randomStr()); + List all = userMapper.findAll(); + commentReq.setPid(1L); + commentReq.setToUserId(2l); + getMockData(post("/user/comment/create"), userLogin(), commentReq).andDo(result -> { + Response response = getResponse(result, COMMENT_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + CommentModel model = response.getResult(); assertNotEquals(0, model.getId()); assertEquals(commentReq.getPid(), model.getPid().longValue()); - assertEquals(-1, model.getPid().longValue()); + assertEquals(1, model.getPid().longValue()); assertEquals(commentReq.getContent(), model.getContent()); assertNotNull(model.getDate()); assertNotNull(model.getFromUser()); - assertNull(model.getToUser()); + assertNotNull(model.getToUser()); }); commentReq.setPagePath("/article/" + article.getId()); - commentReq.setContent(UUID.randomUUID().toString()); + commentReq.setContent(randomStr()); commentReq.setPid(-1L); commentReq.setToUserId(2); - mockMvc.perform(post("/user/comment/create") - .contentType(MediaType.APPLICATION_JSON_UTF8) - .content(JSONObject.fromObject(commentReq).toString()) - .header("Authorization", token) - ).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - CommentModel model = (CommentModel) JSONObject.toBean(object.getJSONObject(Result), CommentModel.class); + getMockData(post("/user/comment/create"), userLogin(), commentReq).andDo(result -> { + Response response = getResponse(result, COMMENT_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + CommentModel model = response.getResult(); // 响应数据的完整性 assertNotEquals(0, model.getId()); assertEquals(commentReq.getPid(), model.getPid().longValue()); @@ -79,20 +74,16 @@ public class CommentControllerTest extends BaseTest { }); // 测试二级回复 - Comment lastestComment = commentMapper.getLastestComment(); + Comment latestComment = commentMapper.getLastestComment(); commentReq.setPagePath("/article/" + article.getId()); - commentReq.setContent(UUID.randomUUID().toString()); - commentReq.setPid(lastestComment.getId()); - mockMvc.perform(post("/user/comment/create") - .contentType(MediaType.APPLICATION_JSON_UTF8) - .content(JSONObject.fromObject(commentReq).toString()) - .header("Authorization", token) - ).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - CommentModel model = (CommentModel) JSONObject.toBean(object.getJSONObject(Result), CommentModel.class); + commentReq.setContent(randomStr()); + commentReq.setPid(latestComment.getId()); + getMockData(post("/user/comment/create"), userLogin(), commentReq).andDo(result -> { + Response response = getResponse(result, COMMENT_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + CommentModel model = response.getResult(); // 重新获取父评论信息 - Comment pCommon = commentMapper.findCommentById(lastestComment.getId()); + Comment pCommon = commentMapper.findCommentById(latestComment.getId()); assertEquals(pCommon.getId(), model.getPid()); }); } @@ -116,16 +107,13 @@ public class CommentControllerTest extends BaseTest { // 接口测试 long id = comment.getId(); assertNotEquals(0, id); - String token = userLogin(); - mockMvc.perform(delete("/user/comment/del?id=" + id).header("Authorization", token)).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - assertTrue(object.getBoolean(Result)); - }); - mockMvc.perform(delete("/user/comment/del?id=" + id).header("Authorization", token)).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(DATA_IS_DELETED.getCode(), object.getInt(Code)); + getMockData(delete("/user/comment/del?id=" + id), userLogin()).andDo(result -> { + Response response = getResponse(result, BOOLEAN_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertTrue(response.getResult()); }); + getMockData(delete("/user/comment/del?id=" + id), userLogin()) + .andDo(result -> assertEquals(DATA_IS_DELETED.getCode(), getResponse(result, COMMENT_MODEL_TYPE).getCode())); } @Test @@ -133,16 +121,12 @@ public class CommentControllerTest extends BaseTest { Comment comment = commentMapper.getLastestComment(); CommentReq commentReq = new CommentReq(); commentReq.setId(comment.getId()); - commentReq.setContent(UUID.randomUUID().toString()); + commentReq.setContent(randomStr()); // 不合法数据 setResponseId - mockMvc.perform(put("/user/comment/update") - .content(JSONObject.fromObject(commentReq).toString()) - .contentType(MediaType.APPLICATION_JSON_UTF8) - .header("Authorization", userLogin()) - ).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - CommentModel c = (CommentModel) JSONObject.toBean(object.getJSONObject(Result), CommentModel.class); + getMockData(put("/user/comment/update"), userLogin(), commentReq).andDo(result -> { + Response response = getResponse(result, COMMENT_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + CommentModel c = response.getResult(); assertEquals(commentReq.getContent(), c.getContent()); }); } diff --git a/src/test/java/cn/celess/blog/controller/LinksControllerTest.java b/src/test/java/cn/celess/blog/controller/LinksControllerTest.java index 3b9d670..646ef85 100644 --- a/src/test/java/cn/celess/blog/controller/LinksControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/LinksControllerTest.java @@ -1,262 +1,238 @@ -package cn.celess.blog.controller; - -import cn.celess.blog.BaseTest; -import cn.celess.blog.entity.PartnerSite; -import cn.celess.blog.entity.model.PageData; -import cn.celess.blog.entity.request.LinkApplyReq; -import cn.celess.blog.entity.request.LinkReq; -import cn.celess.blog.exception.MyException; -import cn.celess.blog.mapper.PartnerMapper; -import cn.celess.blog.service.MailService; -import cn.celess.blog.service.PartnerSiteService; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.extern.slf4j.Slf4j; -import net.sf.json.JSONObject; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.mail.SimpleMailMessage; - -import java.lang.reflect.Field; -import java.util.UUID; - -import static cn.celess.blog.enmu.ResponseEnum.*; -import static org.junit.Assert.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; - -@Slf4j -public class LinksControllerTest extends BaseTest { - - @Autowired - PartnerMapper mapper; - @Autowired - PartnerSiteService partnerSiteService; - - - @Test - public void create() throws Exception { - LinkReq linkReq = new LinkReq(); - linkReq.setName(UUID.randomUUID().toString().substring(0, 4)); - linkReq.setOpen(false); - linkReq.setUrl("https://" + randomStr(4) + "celess.cn"); - String token = adminLogin(); - mockMvc.perform( - post("/admin/links/create") - .content(JSONObject.fromObject(linkReq).toString()) - .header("Authorization", token) - .contentType(MediaType.APPLICATION_JSON) - ).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - PartnerSite site = (PartnerSite) JSONObject.toBean(object.getJSONObject(Result), PartnerSite.class); - assertNotNull(site.getId()); - assertEquals(linkReq.getName(), site.getName()); - assertEquals(linkReq.getUrl(), site.getUrl()); - assertEquals(linkReq.isOpen(), site.getOpen()); - }); - - // https/http - linkReq.setName(UUID.randomUUID().toString().substring(0, 4)); - linkReq.setOpen(false); - String url = randomStr(4) + ".celess.cn"; - linkReq.setUrl(url); - mockMvc.perform( - post("/admin/links/create") - .content(JSONObject.fromObject(linkReq).toString()) - .header("Authorization", token) - .contentType("application/json") - ).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - PartnerSite site = (PartnerSite) JSONObject.toBean(object.getJSONObject(Result), PartnerSite.class); - assertEquals("http://" + url, site.getUrl()); - }); - - // 测试已存在的数据 - mockMvc.perform( - post("/admin/links/create") - .content(JSONObject.fromObject(linkReq).toString()) - .header("Authorization", token) - .contentType("application/json") - ).andDo(result -> assertEquals(DATA_HAS_EXIST.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); - } - - @Test - public void del() throws Exception { - PartnerSite partnerSite = new PartnerSite(); - partnerSite.setName(UUID.randomUUID().toString().substring(0, 4)); - partnerSite.setOpen(true); - partnerSite.setDesc(""); - partnerSite.setIconPath(""); - partnerSite.setUrl("https://" + randomStr(4) + ".celess.cn"); - mapper.insert(partnerSite); - PartnerSite lastest = mapper.getLastest(); - assertNotNull(lastest.getId()); - String token = adminLogin(); - mockMvc.perform(delete("/admin/links/del/" + lastest.getId()).header("Authorization", token)).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - assertTrue(object.getBoolean(Result)); - }); - long id = lastest.getId(); - do { - id += 1; - } while (mapper.existsById(id)); - System.out.println("删除ID=" + id + "的数据"); - mockMvc.perform(delete("/admin/links/del/" + id).header("Authorization", token)).andDo(result -> - assertEquals(DATA_NOT_EXIST.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)) - ); - } - - @Test - public void update() throws Exception { - // 增数据 - PartnerSite partnerSite = new PartnerSite(); - partnerSite.setName(UUID.randomUUID().toString().substring(0, 4)); - partnerSite.setOpen(true); - partnerSite.setDesc(""); - partnerSite.setIconPath(""); - partnerSite.setDelete(false); - partnerSite.setUrl("https://" + randomStr(4) + ".celess.cn"); - mapper.insert(partnerSite); - // 查数据 - PartnerSite lastest = mapper.getLastest(); - assertNotNull(lastest.getId()); - String token = adminLogin(); - // 构建请求 - LinkReq linkReq = new LinkReq(); - linkReq.setUrl(lastest.getUrl()); - linkReq.setOpen(!lastest.getOpen()); - linkReq.setName(UUID.randomUUID().toString().substring(0, 4)); - linkReq.setId(lastest.getId()); - mockMvc.perform( - put("/admin/links/update") - .content(JSONObject.fromObject(linkReq).toString()) - .contentType(MediaType.APPLICATION_JSON) - .header("Authorization", token) - ).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - PartnerSite site = (PartnerSite) JSONObject.toBean(object.getJSONObject(Result), PartnerSite.class); - assertNotNull(site.getId()); - assertEquals(linkReq.getId(), site.getId().longValue()); - assertEquals(linkReq.getUrl(), site.getUrl()); - assertEquals(linkReq.getName(), site.getName()); - assertEquals(linkReq.isOpen(), site.getOpen()); - }); - } - - @Test - public void allForOpen() throws Exception { - mockMvc.perform(get("/links")).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - object.getJSONArray(Result).forEach(o -> { - PartnerSite site = (PartnerSite) JSONObject.toBean(JSONObject.fromObject(o), PartnerSite.class); - assertNotNull(site.getUrl()); - assertNull(site.getOpen()); - assertNotNull(site.getName()); - }); - }); - } - - @Test - public void all() throws Exception { - mockMvc.perform(get("/admin/links?page=1&count=10").header("Authorization", adminLogin())).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - PageData pageData = (PageData) JSONObject.toBean(object.getJSONObject(Result), PageData.class); - assertEquals(1, pageData.getPageNum()); - assertEquals(10, pageData.getPageSize()); - for (Object o : pageData.getList()) { - PartnerSite site = (PartnerSite) JSONObject.toBean(JSONObject.fromObject(o), PartnerSite.class); - assertNotNull(site.getUrl()); - assertNotNull(site.getName()); - assertNotNull(site.getOpen()); - } - }); - } - - // 手动测试 - @Test - public void apply() { - // 做service 层的测试 - // mockEmailServiceInstance(partnerSiteService, "mailService"); - mockInjectInstance(partnerSiteService, "mailService", new TestMailServiceImpl()); - LinkApplyReq req = new LinkApplyReq(); - req.setName(randomStr(4)); - req.setUrl("https://" + randomStr(4) + ".celess.cn"); - req.setIconPath("https://www.celess.cn/example.png"); - req.setDesc("desc :" + randomStr()); - req.setEmail(randomStr(4) + "@celess.cn"); - req.setLinkUrl(req.getUrl() + "/links"); - try { - // 抓取不到数据的链接 - partnerSiteService.apply(req); - } catch (MyException e) { - log.debug("测试抓取不到数据"); - assertEquals(CANNOT_GET_DATA.getCode(), e.getCode()); - } - - req.setLinkUrl("https://bing.com"); - req.setUrl(req.getLinkUrl()); - try { - partnerSiteService.apply(req); - } catch (MyException e) { - log.debug("测试未添加本站链接的友链申请"); - assertEquals(APPLY_LINK_NO_ADD_THIS_SITE.getCode(), e.getCode()); - assertNotNull(e.getResult()); - try { - // 测试uuid一致性 - log.debug("测试uuid一致性"); - partnerSiteService.apply(req); - } catch (MyException e2) { - assertEquals(e.getResult(), e2.getResult()); - } - } - log.debug("测试正常申请"); - req.setLinkUrl("https://www.celess.cn"); - req.setUrl(req.getLinkUrl()); - PartnerSite apply = partnerSiteService.apply(req); - assertNotNull(apply); - assertNotNull(apply.getId()); - } - - @Test - public void reapply() { - //mockEmailServiceInstance(partnerSiteService, "mailService"); - try { - partnerSiteService.reapply(randomStr()); - throw new AssertionError(); - } catch (MyException e) { - assertEquals(DATA_EXPIRED.getCode(), e.getCode()); - } - - LinkApplyReq req = new LinkApplyReq(); - req.setName(randomStr(4)); - req.setIconPath("https://www.celess.cn/example.png"); - req.setDesc("desc :" + randomStr()); - req.setEmail(randomStr(4) + "@celess.cn"); - req.setLinkUrl("https://bing.com"); - req.setUrl(req.getLinkUrl()); - String uuid = null; - try { - partnerSiteService.apply(req); - // err here - throw new AssertionError(); - } catch (MyException e) { - uuid = (String) e.getResult(); - String reapply = partnerSiteService.reapply(uuid); - assertEquals(reapply, "success"); - } - - try { - partnerSiteService.reapply(uuid); - throw new AssertionError(); - } catch (MyException e) { - assertEquals(DATA_EXPIRED.getCode(), e.getCode()); - } - - } +package cn.celess.blog.controller; + +import cn.celess.blog.BaseTest; +import cn.celess.blog.entity.PartnerSite; +import cn.celess.blog.entity.Response; +import cn.celess.blog.entity.model.PageData; +import cn.celess.blog.entity.request.LinkApplyReq; +import cn.celess.blog.entity.request.LinkReq; +import cn.celess.blog.exception.MyException; +import cn.celess.blog.mapper.PartnerMapper; +import cn.celess.blog.service.PartnerSiteService; +import com.fasterxml.jackson.core.type.TypeReference; +import lombok.extern.slf4j.Slf4j; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; + +import static cn.celess.blog.enmu.ResponseEnum.*; +import static org.junit.Assert.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; + +@Slf4j +public class LinksControllerTest extends BaseTest { + + @Autowired + PartnerMapper mapper; + private static final TypeReference LINK_MODEL_TYPE = new TypeReference>() { + }; + private static final TypeReference LINK_MODEL_LIST_TYPE = new TypeReference>>() { + }; + private static final TypeReference LINK_MODEL_PAGE_TYPE = new TypeReference>>() { + }; + @Autowired + PartnerSiteService partnerSiteService; + + + @Test + public void create() throws Exception { + LinkReq linkReq = new LinkReq(); + linkReq.setName(randomStr(4)); + linkReq.setOpen(false); + linkReq.setUrl("https://" + randomStr(4) + "example.com"); + getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result -> { + Response response = getResponse(result, LINK_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + PartnerSite site = response.getResult(); + assertNotNull(site.getId()); + assertEquals(linkReq.getName(), site.getName()); + assertEquals(linkReq.getUrl(), site.getUrl()); + assertEquals(linkReq.isOpen(), site.getOpen()); + }); + + // https/http + linkReq.setName(randomStr(4)); + linkReq.setOpen(false); + linkReq.setUrl(randomStr(4) + ".example.com"); + getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result -> { + Response response = getResponse(result, LINK_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + PartnerSite site = response.getResult(); + assertEquals("http://" + linkReq.getUrl(), site.getUrl()); + }); + + // 测试已存在的数据 + getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result -> + assertEquals(DATA_HAS_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode()) + ); + } + + @Test + public void del() throws Exception { + PartnerSite partnerSite = new PartnerSite(); + partnerSite.setName(randomStr(4)); + partnerSite.setOpen(true); + partnerSite.setDesc(""); + partnerSite.setIconPath(""); + partnerSite.setUrl("https://" + randomStr(4) + ".celess.cn"); + mapper.insert(partnerSite); + PartnerSite latest = mapper.getLastest(); + assertNotNull(latest.getId()); + getMockData(delete("/admin/links/del/" + latest.getId()), adminLogin()).andDo(result -> { + Response response = getResponse(result, BOOLEAN_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertTrue(response.getResult()); + }); + long id = latest.getId(); + do { + id += 1; + } while (mapper.existsById(id)); + System.out.println("删除ID=" + id + "的数据"); + getMockData(delete("/admin/links/del/" + id), adminLogin()).andDo(result -> + assertEquals(DATA_NOT_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode()) + ); + } + + @Test + public void update() throws Exception { + // 增数据 + PartnerSite partnerSite = new PartnerSite(); + partnerSite.setName(randomStr(4)); + partnerSite.setOpen(true); + partnerSite.setDesc(""); + partnerSite.setIconPath(""); + partnerSite.setDelete(false); + partnerSite.setUrl("https://" + randomStr(5) + ".celess.cn"); + mapper.insert(partnerSite); + // 查数据 + PartnerSite latest = mapper.getLastest(); + assertNotNull(latest.getId()); + // 构建请求 + LinkReq linkReq = new LinkReq(); + linkReq.setUrl(latest.getUrl()); + linkReq.setOpen(!latest.getOpen()); + linkReq.setName(randomStr(4)); + linkReq.setId(latest.getId()); + + getMockData(put("/admin/links/update"), adminLogin(), linkReq).andDo(result -> { + Response response = getResponse(result, LINK_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + PartnerSite site = response.getResult(); + assertNotNull(site.getId()); + assertEquals(linkReq.getId(), site.getId().longValue()); + assertEquals(linkReq.getUrl(), site.getUrl()); + assertEquals(linkReq.getName(), site.getName()); + assertEquals(linkReq.isOpen(), site.getOpen()); + }); + } + + @Test + public void allForOpen() throws Exception { + getMockData(get("/links")).andDo(result -> { + Response> response = getResponse(result, LINK_MODEL_LIST_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + response.getResult().forEach(site -> { + assertNotNull(site.getUrl()); + assertNull(site.getOpen()); + assertNotNull(site.getName()); + }); + }); + } + + @Test + public void all() throws Exception { + getMockData(get("/admin/links?page=1&count=10"), adminLogin()).andDo(result -> { + Response> response = getResponse(result, LINK_MODEL_PAGE_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + PageData pageData = response.getResult(); + assertEquals(1, pageData.getPageNum()); + assertEquals(10, pageData.getPageSize()); + for (PartnerSite site : pageData.getList()) { + assertNotNull(site.getUrl()); + assertNotNull(site.getName()); + assertNotNull(site.getOpen()); + } + }); + } + + @Test + public void apply() { + // 做service 层的测试 + // mockEmailServiceInstance(partnerSiteService, "mailService"); + mockInjectInstance(partnerSiteService, "mailService", new TestMailServiceImpl()); + LinkApplyReq req = new LinkApplyReq(); + req.setName(randomStr(4)); + req.setUrl("https://" + randomStr(4) + ".celess.cn"); + req.setIconPath("https://www.celess.cn/example.png"); + req.setDesc("desc :" + randomStr()); + req.setEmail(randomStr(4) + "@celess.cn"); + req.setLinkUrl(req.getUrl() + "/links"); + try { + // 抓取不到数据的链接 + partnerSiteService.apply(req); + } catch (MyException e) { + log.debug("测试抓取不到数据"); + assertEquals(CANNOT_GET_DATA.getCode(), e.getCode()); + } + + req.setLinkUrl("https://bing.com"); + req.setUrl(req.getLinkUrl()); + try { + partnerSiteService.apply(req); + } catch (MyException e) { + log.debug("测试未添加本站链接的友链申请"); + assertEquals(APPLY_LINK_NO_ADD_THIS_SITE.getCode(), e.getCode()); + assertNotNull(e.getResult()); + try { + // 测试uuid一致性 + log.debug("测试uuid一致性"); + partnerSiteService.apply(req); + } catch (MyException e2) { + assertEquals(e.getResult(), e2.getResult()); + } + } + log.debug("测试正常申请"); + req.setLinkUrl("https://www.celess.cn"); + req.setUrl(req.getLinkUrl()); + PartnerSite apply = partnerSiteService.apply(req); + assertNotNull(apply); + assertNotNull(apply.getId()); + } + + @Test + public void reapply() { + //mockEmailServiceInstance(partnerSiteService, "mailService"); + try { + partnerSiteService.reapply(randomStr()); + throw new AssertionError(); + } catch (MyException e) { + assertEquals(DATA_EXPIRED.getCode(), e.getCode()); + } + + LinkApplyReq req = new LinkApplyReq(); + req.setName(randomStr(4)); + req.setIconPath("https://www.celess.cn/example.png"); + req.setDesc("desc :" + randomStr()); + req.setEmail(randomStr(4) + "@celess.cn"); + req.setLinkUrl("https://bing.com"); + req.setUrl(req.getLinkUrl()); + String uuid; + try { + partnerSiteService.apply(req); + // err here + throw new AssertionError(); + } catch (MyException e) { + uuid = (String) e.getResult(); + String reapply = partnerSiteService.reapply(uuid); + assertEquals(reapply, "success"); + } + + try { + partnerSiteService.reapply(uuid); + throw new AssertionError(); + } catch (MyException e) { + assertEquals(DATA_EXPIRED.getCode(), e.getCode()); + } + } } \ No newline at end of file diff --git a/src/test/java/cn/celess/blog/controller/TagControllerTest.java b/src/test/java/cn/celess/blog/controller/TagControllerTest.java index 2d19634..dd3811f 100644 --- a/src/test/java/cn/celess/blog/controller/TagControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/TagControllerTest.java @@ -1,36 +1,42 @@ package cn.celess.blog.controller; import cn.celess.blog.BaseTest; +import cn.celess.blog.entity.Response; import cn.celess.blog.entity.Tag; import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.model.TagModel; import cn.celess.blog.mapper.TagMapper; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; +import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import java.util.UUID; +import java.util.List; +import java.util.Map; +import static cn.celess.blog.enmu.ResponseEnum.*; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static cn.celess.blog.enmu.ResponseEnum.*; public class TagControllerTest extends BaseTest { @Autowired TagMapper tagMapper; + private static final TypeReference TAG_MODEL_TYPE = new TypeReference>() { + + }; + private static final TypeReference TAG_MODEL_PAGE_TYPE = new TypeReference>>() { + }; + private static final TypeReference TAG_NAC_LIST_TYPE = new TypeReference>>>() { + }; @Test public void addOne() throws Exception { String name = randomStr(4); - mockMvc.perform(post("/admin/tag/create?name=" + name)).andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); - mockMvc.perform(post("/admin/tag/create?name=" + name).header("authorization", userLogin())).andDo(result -> assertEquals(PERMISSION_ERROR.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); - mockMvc.perform(post("/admin/tag/create?name=" + name).header("authorization", adminLogin())).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - JSONObject resJson = object.getJSONObject(Result); - TagModel tag = (TagModel) JSONObject.toBean(resJson, TagModel.class); + getMockData(post("/admin/tag/create?name=" + name)).andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), getResponse(result, STRING_TYPE).getCode())); + getMockData(post("/admin/tag/create?name=" + name), userLogin()).andDo(result -> assertEquals(PERMISSION_ERROR.getCode(), getResponse(result, STRING_TYPE).getCode())); + getMockData(post("/admin/tag/create?name=" + name), adminLogin()).andDo(result -> { + Response response = getResponse(result, TAG_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + TagModel tag = response.getResult(); assertNotNull(tag.getId()); assertEquals(name, tag.getName()); }); @@ -42,16 +48,14 @@ public class TagControllerTest extends BaseTest { public void delOne() throws Exception { Tag lastestTag = tagMapper.getLastestTag(); assertNotNull(lastestTag.getId()); - String token = adminLogin(); - mockMvc.perform(delete("/admin/tag/del?id=" + lastestTag.getId()).header("Authorization", token)).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - assertTrue(object.getBoolean(Result)); + getMockData(delete("/admin/tag/del?id=" + lastestTag.getId()), adminLogin()).andDo(result -> { + Response response = getResponse(result, BOOLEAN_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertTrue(response.getResult()); }); long id = lastestTag.getId() * 2; - mockMvc.perform(delete("/admin/tag/del?id=" + id).header("Authorization", token)).andDo(result -> - assertEquals(TAG_NOT_EXIST.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)) - ); + getMockData(delete("/admin/tag/del?id=" + id), adminLogin()) + .andDo(result -> assertEquals(TAG_NOT_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode())); } @@ -59,12 +63,12 @@ public class TagControllerTest extends BaseTest { public void updateOne() throws Exception { Tag tag = tagMapper.getLastestTag(); assertNotNull(tag.getId()); - String name = UUID.randomUUID().toString().substring(0, 4); - mockMvc.perform(put("/admin/tag/update?id=" + tag.getId() + "&name=" + name).header("Authorization", adminLogin())).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - assertNotNull(object.getJSONObject(Result)); - TagModel t = (TagModel) JSONObject.toBean(object.getJSONObject(Result), TagModel.class); + String name = randomStr(4); + getMockData(put("/admin/tag/update?id=" + tag.getId() + "&name=" + name), adminLogin()).andDo(result -> { + Response response = getResponse(result, TAG_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertNotNull(response.getResult()); + TagModel t = response.getResult(); assertEquals(name, t.getName()); assertEquals(tag.getId(), t.getId()); }); @@ -73,40 +77,33 @@ public class TagControllerTest extends BaseTest { @Test public void getPage() throws Exception { - mockMvc.perform(get("/tags?page=1&count=5")) - .andExpect(status().is(200)) - .andDo(result -> { - JSONObject articlesJSON = JSONObject.fromObject(result.getResponse().getContentAsString()); - // 断言获取数据成功 - assertEquals(SUCCESS.getCode(), articlesJSON.getInt(Code)); - // 结果集非空 - assertNotNull(articlesJSON.getJSONObject(Result)); - // 判断pageInfo是否包装完全 - JSONObject resultJson = JSONObject.fromObject(articlesJSON.getJSONObject(Result)); - PageData pageData = (PageData) JSONObject.toBean(resultJson, PageData.class); - assertNotEquals(0, pageData.getTotal()); - assertEquals(1, pageData.getPageNum()); - assertEquals(5, pageData.getPageSize()); - // 内容完整 - for (Object tag : pageData.getList()) { - TagModel t = (TagModel) JSONObject.toBean(JSONObject.fromObject(tag), TagModel.class); - assertNotNull(t.getId()); - assertNotNull(t.getName()); - } - }); + getMockData(get("/tags?page=1&count=5")).andDo(result -> { + Response> response = getResponse(result, TAG_MODEL_PAGE_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + // 结果集非空 + assertNotNull(response.getResult()); + // 判断pageInfo是否包装完全 + PageData pageData = response.getResult(); + assertNotEquals(0, pageData.getTotal()); + assertEquals(1, pageData.getPageNum()); + assertEquals(5, pageData.getPageSize()); + // 内容完整 + for (TagModel t : pageData.getList()) { + assertNotNull(t.getId()); + assertNotNull(t.getName()); + } + }); } @Test public void getTagNameAndCount() throws Exception { - mockMvc.perform(get("/tags/nac")).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - JSONArray jsonArray = object.getJSONArray(Result); - assertNotNull(jsonArray); - jsonArray.forEach(o -> { - JSONObject json = JSONObject.fromObject(o); - assertTrue(json.containsKey("size")); - assertTrue(json.containsKey("name")); + getMockData(get("/tags/nac")).andDo(result -> { + Response>> response = getResponse(result, TAG_NAC_LIST_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertNotNull(response.getResult()); + response.getResult().forEach(o -> { + assertNotNull(o.get("name")); + assertNotNull(o.get("size")); }); }); } diff --git a/src/test/java/cn/celess/blog/controller/UserControllerTest.java b/src/test/java/cn/celess/blog/controller/UserControllerTest.java index b22bed4..a6bc88b 100644 --- a/src/test/java/cn/celess/blog/controller/UserControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/UserControllerTest.java @@ -1,282 +1,277 @@ -package cn.celess.blog.controller; - -import cn.celess.blog.BaseTest; -import cn.celess.blog.entity.User; -import cn.celess.blog.entity.model.PageData; -import cn.celess.blog.entity.model.UserModel; -import cn.celess.blog.entity.request.LoginReq; -import cn.celess.blog.entity.request.UserReq; -import cn.celess.blog.mapper.UserMapper; -import cn.celess.blog.service.UserService; -import cn.celess.blog.util.MD5Util; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.mock.web.MockMultipartFile; -import org.springframework.util.LinkedMultiValueMap; -import org.springframework.util.MultiValueMap; - -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.*; - -import static org.junit.Assert.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static cn.celess.blog.enmu.ResponseEnum.*; - -public class UserControllerTest extends BaseTest { - - @Autowired - UserMapper userMapper; - @Autowired - UserService userService; - - @Test - public void login() throws Exception { - assertNotNull(userLogin()); - assertNotNull(adminLogin()); - // 用户不存在 - LoginReq req = new LoginReq(); - req.setEmail("zh@celess.cn"); - req.setPassword("123456789"); - req.setIsRememberMe(false); - JSONObject loginReq = JSONObject.fromObject(req); - mockMvc.perform(post("/login").content(loginReq.toString()).contentType("application/json")) - .andDo(result -> - assertEquals(USER_NOT_EXIST.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)) - ); - } - - @Test - public void registration() { - // ignore - } - - @Test - public void logout() throws Exception { - mockMvc.perform(get("/logout")).andDo(result -> assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); - mockMvc.perform(get("/logout").header("Authorization", userLogin())).andDo(result -> assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); - } - - @Test - public void updateInfo() throws Exception { - String desc = UUID.randomUUID().toString().substring(0, 4); - String disPlayName = UUID.randomUUID().toString().substring(0, 4); - mockMvc.perform(put("/user/userInfo/update?desc=" + desc + "&displayName=" + disPlayName).header("Authorization", userLogin())) - .andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - UserModel u = (UserModel) JSONObject.toBean(object.getJSONObject(Result), UserModel.class); - assertEquals(desc, u.getDesc()); - assertEquals(disPlayName, u.getDisplayName()); - assertNotNull(u.getId()); - }); - } - - @Test - public void getUserInfo() throws Exception { - mockMvc.perform(get("/user/userInfo").header("Authorization", userLogin())) - .andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - UserModel u = (UserModel) JSONObject.toBean(object.getJSONObject(Result), UserModel.class); - assertNotNull(u.getId()); - assertNotNull(u.getEmail()); - assertNotNull(u.getDisplayName()); - assertNotNull(u.getEmailStatus()); - assertNotNull(u.getAvatarImgUrl()); - assertNotNull(u.getDesc()); - assertNotNull(u.getRecentlyLandedDate()); - assertNotNull(u.getRole()); - }); - } - - @Test - public void upload() throws Exception { - URL url = new URL("https://56462271.oss-cn-beijing.aliyuncs.com/web/logo.png"); - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - connection.setRequestMethod("GET"); - InputStream inputStream = connection.getInputStream(); - assertNotNull(inputStream); - - // mock 实现类 - mockInjectInstance(userService, "qiniuService", new TestQiNiuServiceImpl()); - - MockMultipartFile file = new MockMultipartFile("file", "logo.png", MediaType.IMAGE_PNG_VALUE, inputStream); - mockMvc.perform(multipart("/user/imgUpload").file(file)).andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); - mockMvc.perform(multipart("/user/imgUpload").file(file).header("Authorization", userLogin())).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - assertNotNull(object.getString(Result)); - }); - } - - @Test - public void sendResetPwdEmail() { - // ignore - } - - @Test - public void sendVerifyEmail() { - // ignore - } - - @Test - public void emailVerify() { - // ignore - } - - @Test - public void resetPwd() { - // ignore - } - - @Test - public void multipleDelete() throws Exception { - List userList = new ArrayList<>(); - for (int i = 0; i < 10; i++) { - String s = UUID.randomUUID().toString(); - String email = s.substring(s.length() - 4) + "@celess.cn"; - String pwd = MD5Util.getMD5("123456789"); - User user = new User(email, pwd); - int i1 = userMapper.addUser(user); - if (i1 == 0) { - continue; - } - userList.add(userMapper.findByEmail(email)); - if (i == 9) { - //设置一个管理员 - userMapper.setUserRole(userMapper.findByEmail(email).getId(), "admin"); - } - } - List idList = new ArrayList<>(); - userList.forEach(user -> idList.add(user.getId())); - System.out.println("id :: == > " + idList.toString()); - mockMvc.perform(delete("/admin/user/delete").content(idList.toString()).contentType("application/json")) - .andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); - mockMvc.perform(delete("/admin/user/delete").content(idList.toString()).contentType("application/json").header("Authorization", userLogin())) - .andDo(result -> assertEquals(PERMISSION_ERROR.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); - mockMvc.perform(delete("/admin/user/delete").content(idList.toString()).contentType("application/json").header("Authorization", adminLogin())) - .andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - JSONArray jsonArray = object.getJSONArray(Result); - jsonArray.forEach(o -> { - JSONObject json = JSONObject.fromObject(o); - // 判断响应数据中是否包含输入的id - assertTrue(idList.contains((long) json.getInt("id"))); - // 判断处理状态 - boolean status = json.getBoolean("status"); - if (json.containsKey("msg")) - assertFalse(status); - else - assertTrue(status); - }); - }); - - } - - @Test - public void updateInfoByAdmin() throws Exception { - UserReq userReq = new UserReq(); - String email = UUID.randomUUID().toString().substring(0, 4) + "@celess.cn"; - User user = new User(email, MD5Util.getMD5("123456789")); - userMapper.addUser(user); - User userByDb = userMapper.findByEmail(email); - userReq.setId(userByDb.getId()); - userReq.setPwd(UUID.randomUUID().toString().replaceAll("-", "").substring(0, 10)); - userReq.setDesc(UUID.randomUUID().toString()); - userReq.setEmailStatus(new Random().nextBoolean()); - userReq.setRole("admin"); - userReq.setDisplayName(UUID.randomUUID().toString().substring(0, 4)); - userReq.setEmail(UUID.randomUUID().toString().substring(0, 5) + "@celess.cn"); - mockMvc.perform(put("/admin/user").contentType("application/json").content(JSONObject.fromObject(userReq).toString())) - .andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); - mockMvc.perform(put("/admin/user").contentType("application/json").header("Authorization", userLogin()).content(JSONObject.fromObject(userReq).toString())) - .andDo(result -> assertEquals(PERMISSION_ERROR.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); - mockMvc.perform(put("/admin/user").contentType("application/json").header("Authorization", adminLogin()).content(JSONObject.fromObject(userReq).toString())) - .andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - UserModel userModel = (UserModel) JSONObject.toBean(object.getJSONObject(Result), UserModel.class); - assertEquals(userReq.getId(), userModel.getId()); - assertEquals(userReq.getRole(), userModel.getRole()); - assertEquals(userReq.getEmail(), userModel.getEmail()); - assertEquals(userReq.getDesc(), userModel.getDesc()); - assertEquals(userReq.getDisplayName(), userModel.getDisplayName()); - }); - } - - @Test - public void getAllUser() throws Exception { - mockMvc.perform(get("/admin/users?page=1&count=10")) - .andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); - mockMvc.perform(get("/admin/users?page=1&count=10").header("authorization", userLogin())) - .andDo(result -> assertEquals(PERMISSION_ERROR.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); - mockMvc.perform(get("/admin/users?page=1&count=10").header("Authorization", adminLogin())) - .andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - // 结果集非空 - assertNotNull(object.getJSONObject(Result)); - // 判断pageInfo是否包装完全 - JSONObject resultJson = JSONObject.fromObject(object.getJSONObject(Result)); - PageData pageData = (PageData) JSONObject.toBean(resultJson, PageData.class); - assertNotEquals(0, pageData.getTotal()); - assertEquals(1, pageData.getPageNum()); - assertEquals(10, pageData.getPageSize()); - // 内容完整 - for (Object user : pageData.getList()) { - UserModel u = (UserModel) JSONObject.toBean(JSONObject.fromObject(user), UserModel.class); - assertNotNull(u.getId()); - assertNotNull(u.getEmail()); - assertNotNull(u.getRole()); - assertNotNull(u.getEmailStatus()); - assertNotNull(u.getDisplayName()); - } - }); - } - - @Test - public void getEmailStatus() throws Exception { - String email = UUID.randomUUID().toString().substring(0, 4) + "@celess.cn"; - mockMvc.perform(get("/emailStatus/" + email)).andDo(result -> { - String content = result.getResponse().getContentAsString(); - assertEquals(SUCCESS.getCode(), JSONObject.fromObject(content).getInt(Code)); - assertFalse(JSONObject.fromObject(content).getBoolean(Result)); - }); - email = "a@celess.cn"; - mockMvc.perform(get("/emailStatus/" + email)).andDo(result -> { - String content = result.getResponse().getContentAsString(); - assertEquals(SUCCESS.getCode(), JSONObject.fromObject(content).getInt(Code)); - assertTrue(JSONObject.fromObject(content).getBoolean(Result)); - }); - } - - @Test - public void setPwd() throws Exception { - String email = UUID.randomUUID().toString().substring(0, 4) + "@celess.cn"; - assertEquals(1, userMapper.addUser(new User(email, MD5Util.getMD5("1234567890")))); - LoginReq req = new LoginReq(); - req.setEmail(email); - req.setPassword("1234567890"); - req.setIsRememberMe(false); - JSONObject loginReq = JSONObject.fromObject(req); - String contentAsString = mockMvc.perform(post("/login").content(loginReq.toString()).contentType("application/json")).andReturn().getResponse().getContentAsString(); - assertNotNull(contentAsString); - String token = JSONObject.fromObject(contentAsString).getJSONObject(Result).getString("token"); - assertNotNull(token); - MultiValueMap param = new LinkedMultiValueMap(); - param.add("pwd", "1234567890"); - param.add("newPwd", "aaabbbccc"); - param.add("confirmPwd", "aaabbbccc"); - mockMvc.perform(post("/user/setPwd").header("Authorization", token).params(param)).andDo(result -> { - String content = result.getResponse().getContentAsString(); - assertEquals(SUCCESS.getCode(), JSONObject.fromObject(content).getInt(Code)); - assertEquals(MD5Util.getMD5("aaabbbccc"), userMapper.getPwd(email)); - }); - } +package cn.celess.blog.controller; + +import cn.celess.blog.BaseTest; +import cn.celess.blog.entity.Response; +import cn.celess.blog.entity.User; +import cn.celess.blog.entity.model.PageData; +import cn.celess.blog.entity.model.UserModel; +import cn.celess.blog.entity.request.LoginReq; +import cn.celess.blog.entity.request.UserReq; +import cn.celess.blog.mapper.UserMapper; +import cn.celess.blog.service.UserService; +import cn.celess.blog.util.MD5Util; +import cn.celess.blog.util.RedisUtil; +import com.fasterxml.jackson.core.type.TypeReference; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; +import org.springframework.mock.web.MockMultipartFile; +import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; + +import java.io.InputStream; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import static cn.celess.blog.enmu.ResponseEnum.*; +import static org.junit.Assert.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; + + +public class UserControllerTest extends BaseTest { + + @Autowired + UserMapper userMapper; + @Autowired + + RedisUtil redisUtil; + private static final TypeReference USER_MODEL_TYPE = new TypeReference>() { + }; + private static final TypeReference USER_MODEL_PAGE_TYPE = new TypeReference>>() { + }; + private static final TypeReference USER_MODEL_LIST_TYPE = new TypeReference>>>() { + }; + @Autowired + UserService userService; + + + @Test + public void login() throws Exception { + assertNotNull(userLogin()); + assertNotNull(adminLogin()); + // 用户不存在 + LoginReq req = new LoginReq(); + req.setEmail("zh@celess.cn"); + req.setPassword("123456789"); + req.setIsRememberMe(false); + getMockData(post("/login"), null, req).andDo(result -> assertEquals(USER_NOT_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode())); + } + + @Test + public void registration() { + // ignore + } + + @Test + public void logout() throws Exception { + getMockData(get("/logout")).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result, STRING_TYPE).getCode())); + getMockData(get("/logout"), adminLogin()).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result).getCode())); + } + + @Test + public void updateInfo() throws Exception { + String desc = randomStr(4); + String disPlayName = randomStr(4); + getMockData(put("/user/userInfo/update?desc=" + desc + "&displayName=" + disPlayName), userLogin()).andDo(result -> { + Response response = getResponse(result, USER_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + UserModel u = response.getResult(); + assertEquals(desc, u.getDesc()); + assertEquals(disPlayName, u.getDisplayName()); + assertNotNull(u.getId()); + }); + } + + @Test + public void getUserInfo() throws Exception { + getMockData(get("/user/userInfo"), adminLogin()).andDo(result -> { + Response response = getResponse(result, USER_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + UserModel u = response.getResult(); + assertNotNull(u.getId()); + assertNotNull(u.getEmail()); + assertNotNull(u.getDisplayName()); + assertNotNull(u.getEmailStatus()); + assertNotNull(u.getAvatarImgUrl()); + assertNotNull(u.getDesc()); + assertNotNull(u.getRecentlyLandedDate()); + assertNotNull(u.getRole()); + }); + } + + @Test + public void upload() throws Exception { + URL url = new URL("https://56462271.oss-cn-beijing.aliyuncs.com/web/logo.png"); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + connection.setRequestMethod("GET"); + InputStream inputStream = connection.getInputStream(); + assertNotNull(inputStream); + + // mock 实现类 + mockInjectInstance(userService, "qiniuService", new TestQiNiuServiceImpl()); + + MockMultipartFile file = new MockMultipartFile("file", "logo.png", MediaType.IMAGE_PNG_VALUE, inputStream); + getMockData(multipart("/user/imgUpload").file(file), userLogin()).andDo(result -> { + Response response = getResponse(result, OBJECT_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertNotNull(response.getResult()); + }); + } + + @Test + public void sendResetPwdEmail() { + // ignore + } + + @Test + public void sendVerifyEmail() { + // ignore + } + + @Test + public void emailVerify() throws Exception { + String email = randomStr(4) + "@celess.cn"; + String pwd = MD5Util.getMD5("123456789"); + userMapper.addUser(new User(email, pwd)); + String verifyId = randomStr(); + LoginReq req = new LoginReq(email, "123456789", true); + redisUtil.setEx(email + "-verify", verifyId, 2, TimeUnit.DAYS); + getMockData(post("/emailVerify").param("verifyId", verifyId).param("email", email), login(req)).andDo(result -> + assertEquals(SUCCESS.getCode(), getResponse(result, OBJECT_TYPE).getCode()) + ); + } + + @Test + public void resetPwd() throws Exception { + String email = randomStr(4) + "@celess.cn"; + String pwd = MD5Util.getMD5("1234567890"); + userMapper.addUser(new User(email, pwd)); + LoginReq req = new LoginReq(email, "1234567890", true); + String verifyId = randomStr(); + // 设置验证id + redisUtil.setEx(email + "-resetPwd", verifyId, 2, TimeUnit.DAYS); + MockHttpServletRequestBuilder resetPwd = post("/resetPwd").param("verifyId", verifyId).param("email", email).param("pwd", "123456789"); + // 未验证 + getMockData(resetPwd, login(req)).andDo(result -> assertEquals(USEREMAIL_NOT_VERIFY.getCode(), getResponse(result, OBJECT_TYPE).getCode())); + // 设置未验证 + userMapper.updateEmailStatus(email, true); + // 正常 + getMockData(resetPwd, login(req)).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result, OBJECT_TYPE).getCode())); + } + + @Test + public void multipleDelete() throws Exception { + List userList = new ArrayList<>(); + for (int i = 0; i < 10; i++) { + String s = randomStr(); + String email = s.substring(s.length() - 4) + "@celess.cn"; + String pwd = MD5Util.getMD5("123456789"); + User user = new User(email, pwd); + int i1 = userMapper.addUser(user); + if (i1 == 0) { + continue; + } + userList.add(userMapper.findByEmail(email)); + if (i == 9) { + //设置一个管理员 + userMapper.setUserRole(userMapper.findByEmail(email).getId(), "admin"); + } + } + List idList = userList.stream().map(user -> user.getId().intValue()).collect(Collectors.toList()); + getMockData(delete("/admin/user/delete"), adminLogin(), idList).andDo(result -> { + Response>> response = getResponse(result, USER_MODEL_LIST_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + response.getResult().forEach(o -> { + // 判断响应数据中是否包含输入的id + assertTrue(idList.contains((int) o.get("id"))); + // 判断处理状态 + boolean status = (boolean) o.get("status"); + if (o.containsKey("msg")) + assertFalse(status); + else + assertTrue(status); + }); + }); + + } + + @Test + public void updateInfoByAdmin() throws Exception { + UserReq userReq = new UserReq(); + String email = randomStr(4) + "@celess.cn"; + User user = new User(email, MD5Util.getMD5("123456789")); + userMapper.addUser(user); + User userByDb = userMapper.findByEmail(email); + userReq.setId(userByDb.getId()); + userReq.setPwd(randomStr().substring(0, 10)); + userReq.setDesc(randomStr()); + userReq.setEmailStatus(new Random().nextBoolean()); + userReq.setRole("admin"); + userReq.setDisplayName(randomStr(4)); + userReq.setEmail(randomStr(5) + "@celess.cn"); + getMockData(put("/admin/user"), adminLogin(), userReq).andDo(result -> { + Response response = getResponse(result, USER_MODEL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + UserModel userModel = response.getResult(); + assertEquals(userReq.getId(), userModel.getId()); + assertEquals(userReq.getRole(), userModel.getRole()); + assertEquals(userReq.getEmail(), userModel.getEmail()); + assertEquals(userReq.getDesc(), userModel.getDesc()); + assertEquals(userReq.getDisplayName(), userModel.getDisplayName()); + }); + } + + @Test + public void getAllUser() throws Exception { + getMockData(get("/admin/users?page=1&count=10"), adminLogin()).andDo(result -> { + Response> response = getResponse(result, USER_MODEL_PAGE_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + // 结果集非空 + assertNotNull(response.getResult()); + // 判断pageInfo是否包装完全 + PageData pageData = response.getResult(); + assertNotEquals(0, pageData.getTotal()); + assertEquals(1, pageData.getPageNum()); + assertEquals(10, pageData.getPageSize()); + // 内容完整 + for (UserModel u : pageData.getList()) { + assertNotNull(u.getId()); + assertNotNull(u.getEmail()); + assertNotNull(u.getRole()); + assertNotNull(u.getEmailStatus()); + assertNotNull(u.getDisplayName()); + } + }); + } + + @Test + public void getEmailStatus() throws Exception { + String email = randomStr(4) + "@celess.cn"; + getMockData(get("/emailStatus/" + email)).andDo(result -> assertFalse((Boolean) getResponse(result, BOOLEAN_TYPE).getResult())); + getMockData(get("/emailStatus/" + ADMIN_EMAIL)).andDo(result -> assertTrue((Boolean) getResponse(result, BOOLEAN_TYPE).getResult())); + } + + @Test + public void setPwd() throws Exception { + String email = randomStr(4) + "@celess.cn"; + assertEquals(1, userMapper.addUser(new User(email, MD5Util.getMD5("1234567890")))); + LoginReq req = new LoginReq(email, "1234567890", false); + String token = login(req); + assertNotNull(token); + MultiValueMap param = new LinkedMultiValueMap(); + param.add("pwd", "1234567890"); + param.add("newPwd", "aaabbbccc"); + param.add("confirmPwd", "aaabbbccc"); + getMockData(post("/user/setPwd").params(param), token).andDo(result -> { + assertEquals(SUCCESS.getCode(), getResponse(result).getCode()); + assertEquals(MD5Util.getMD5("aaabbbccc"), userMapper.getPwd(email)); + }); + } } \ No newline at end of file diff --git a/src/test/java/cn/celess/blog/controller/VisitorControllerTest.java b/src/test/java/cn/celess/blog/controller/VisitorControllerTest.java index c65d27d..76c97e6 100644 --- a/src/test/java/cn/celess/blog/controller/VisitorControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/VisitorControllerTest.java @@ -1,25 +1,29 @@ package cn.celess.blog.controller; import cn.celess.blog.BaseTest; +import cn.celess.blog.entity.Response; import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.model.VisitorModel; -import com.github.pagehelper.PageInfo; -import net.sf.json.JSONObject; +import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Test; -import org.springframework.test.web.servlet.result.MockMvcResultHandlers; +import static cn.celess.blog.enmu.ResponseEnum.SUCCESS; import static org.junit.Assert.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; -import static cn.celess.blog.enmu.ResponseEnum.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; public class VisitorControllerTest extends BaseTest { + private final TypeReference VISITOR_PAGE_TYPE = new TypeReference>>() { + }; + private final TypeReference VISITOR_TYPE = new TypeReference>() { + }; @Test public void getVisitorCount() throws Exception { - mockMvc.perform(get("/visitor/count")).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - assertTrue(object.containsKey(Result)); + getMockData(get("/visitor/count")).andDo(result -> { + Response response = getResponse(result); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertNotNull(response.getResult()); }); } @@ -27,29 +31,26 @@ public class VisitorControllerTest extends BaseTest { public void page() throws Exception { int count = 10; int page = 1; - mockMvc.perform(get("/admin/visitor/page?count=" + count + "&page=" + page).header("Authorization", adminLogin())) - .andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - JSONObject resultJson = JSONObject.fromObject(object.getJSONObject(Result)); - PageData pageData = (PageData) JSONObject.toBean(resultJson, PageData.class); - assertNotEquals(0, pageData.getTotal()); - assertEquals(1, pageData.getPageNum()); - assertEquals(10, pageData.getPageSize()); - for (Object ver : pageData.getList()) { - VisitorModel v = (VisitorModel) JSONObject.toBean(JSONObject.fromObject(ver), VisitorModel.class); - assertNotEquals(0, v.getId()); - assertNotNull(v.getDate()); - } - }); + getMockData(get("/admin/visitor/page?count=" + count + "&page=" + page), adminLogin()).andDo(result -> { + Response> response = getResponse(result, VISITOR_PAGE_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + PageData pageData = response.getResult(); + assertNotEquals(0, pageData.getTotal()); + assertEquals(1, pageData.getPageNum()); + assertEquals(10, pageData.getPageSize()); + for (VisitorModel v : pageData.getList()) { + assertNotEquals(0, v.getId()); + assertNotNull(v.getDate()); + } + }); } @Test public void add() throws Exception { - mockMvc.perform(post("/visit")).andDo(MockMvcResultHandlers.print()).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - VisitorModel visitorModel = (VisitorModel) JSONObject.toBean(object.getJSONObject(Result), VisitorModel.class); + getMockData(post("/visit")).andDo(result -> { + Response response = getResponse(result, VISITOR_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + VisitorModel visitorModel = response.getResult(); assertNotEquals(0, visitorModel.getId()); assertNotNull(visitorModel.getIp()); }); @@ -57,26 +58,26 @@ public class VisitorControllerTest extends BaseTest { @Test public void dayVisitCount() throws Exception { - mockMvc.perform(get("/dayVisitCount")).andDo(MockMvcResultHandlers.print()).andDo(result -> - assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)) - ); + getMockData(get("/dayVisitCount")).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result).getCode())); } // 手动测试 // @Test public void ipLocation() throws Exception { String ip = "127.0.0.1"; - mockMvc.perform(get("/ip/" + ip)).andDo(MockMvcResultHandlers.print()).andDo(result -> { - assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); - assertTrue(JSONObject.fromObject(result.getResponse().getContentAsString()).containsKey(Result)); + getMockData(get("/ip/" + ip)).andDo(result -> { + Response response = getResponse(result); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertNotNull(response.getResult()); }); } @Test public void getIp() throws Exception { - mockMvc.perform(get("/ip")).andDo(MockMvcResultHandlers.print()).andDo(result -> { - assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); - assertEquals("127.0.0.1", JSONObject.fromObject(result.getResponse().getContentAsString()).getString(Result)); + getMockData(get("/ip")).andDo(result -> { + Response response = getResponse(result, STRING_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertEquals("127.0.0.1", response.getResult()); }); } } \ No newline at end of file diff --git a/src/test/java/cn/celess/blog/controller/WebUpdateInfoControllerTest.java b/src/test/java/cn/celess/blog/controller/WebUpdateInfoControllerTest.java index 3bf2e18..648a41a 100644 --- a/src/test/java/cn/celess/blog/controller/WebUpdateInfoControllerTest.java +++ b/src/test/java/cn/celess/blog/controller/WebUpdateInfoControllerTest.java @@ -1,35 +1,46 @@ package cn.celess.blog.controller; import cn.celess.blog.BaseTest; +import cn.celess.blog.entity.Response; import cn.celess.blog.entity.WebUpdate; import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.model.WebUpdateModel; import cn.celess.blog.mapper.WebUpdateInfoMapper; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; +import com.fasterxml.jackson.core.type.TypeReference; +import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import java.util.Date; import java.util.List; -import java.util.UUID; -import static cn.celess.blog.enmu.ResponseEnum.*; +import static cn.celess.blog.enmu.ResponseEnum.DATA_NOT_EXIST; +import static cn.celess.blog.enmu.ResponseEnum.SUCCESS; import static org.junit.Assert.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +@Slf4j public class WebUpdateInfoControllerTest extends BaseTest { + + private final TypeReference MODAL_TYPE = new TypeReference>() { + }; + private final TypeReference MODAL_LIST_TYPE = new TypeReference>>() { + }; + private final TypeReference MODAL_PAGE_TYPE = new TypeReference>>() { + }; + + @Autowired WebUpdateInfoMapper mapper; @Test public void create() throws Exception { - String info = UUID.randomUUID().toString(); - mockMvc.perform(post("/admin/webUpdate/create?info=" + info).header("Authorization", adminLogin())).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - assertTrue(object.containsKey(Result)); - WebUpdateModel webUpdateModel = (WebUpdateModel) JSONObject.toBean(object.getJSONObject(Result), WebUpdateModel.class); + String info = randomStr(); + getMockData(post("/admin/webUpdate/create?info=" + info), adminLogin()).andDo(result -> { + Response response = getResponse(result, MODAL_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertNotNull(response.getResult()); + WebUpdateModel webUpdateModel = response.getResult(); assertEquals(info, webUpdateModel.getInfo()); assertNotNull(webUpdateModel.getTime()); assertNotEquals(0, webUpdateModel.getId()); @@ -40,7 +51,7 @@ public class WebUpdateInfoControllerTest extends BaseTest { public void del() throws Exception { // 新增数据 WebUpdate webUpdate = new WebUpdate(); - webUpdate.setUpdateInfo(UUID.randomUUID().toString()); + webUpdate.setUpdateInfo(randomStr()); webUpdate.setUpdateTime(new Date()); mapper.insert(webUpdate); // 接口测试 @@ -49,32 +60,31 @@ public class WebUpdateInfoControllerTest extends BaseTest { assertNotEquals(0, update.getId()); long id = update.getId(); - mockMvc.perform(delete("/admin/webUpdate/del/" + id).header("Authorization", adminLogin())).andDo(result -> { - assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); - assertTrue(JSONObject.fromObject(result.getResponse().getContentAsString()).getBoolean(Result)); + getMockData(delete("/admin/webUpdate/del/" + id), adminLogin()).andDo(result -> { + Response response = getResponse(result); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertNotNull(response.getResult()); }); do { id += 2; } while (mapper.existsById(id)); - System.out.println("准备删除ID=" + id + "的不存在记录"); - mockMvc.perform(delete("/admin/webUpdate/del/" + id).header("Authorization", adminLogin())).andDo(result -> - assertEquals(DATA_NOT_EXIST.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)) - ); + log.debug("准备删除ID={}的不存在记录", id); + getMockData(delete("/admin/webUpdate/del/" + id), adminLogin()).andDo(result -> assertEquals(DATA_NOT_EXIST.getCode(), getResponse(result).getCode())); } @Test public void update() throws Exception { // 新增数据 WebUpdate webUpdate = new WebUpdate(); - webUpdate.setUpdateInfo(UUID.randomUUID().toString()); + webUpdate.setUpdateInfo(randomStr()); webUpdate.setUpdateTime(new Date()); mapper.insert(webUpdate); List all = mapper.findAll(); WebUpdate update = all.get(all.size() - 1); assertNotEquals(0, update.getId()); assertNotNull(update.getUpdateInfo()); - String info = UUID.randomUUID().toString(); - mockMvc.perform(put("/admin/webUpdate/update?id=" + update.getId() + "&info=" + info).header("Authorization", adminLogin())).andDo(result -> { + String info = randomStr(); + getMockData(put("/admin/webUpdate/update?id=" + update.getId() + "&info=" + info), adminLogin()).andDo(result -> { List list = mapper.findAll(); WebUpdate up = list.get(list.size() - 1); assertEquals(update.getId(), up.getId()); @@ -85,12 +95,12 @@ public class WebUpdateInfoControllerTest extends BaseTest { @Test public void findAll() throws Exception { - mockMvc.perform(get("/webUpdate")).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - JSONArray jsonArray = object.getJSONArray(Result); - jsonArray.forEach(o -> { - WebUpdateModel webUpdate = (WebUpdateModel) JSONObject.toBean(JSONObject.fromObject(o), WebUpdateModel.class); + getMockData(get("/webUpdate")).andDo(result -> { + Response> response = getResponse(result, MODAL_LIST_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertNotNull(response.getResult()); + assertNotEquals(0, response.getResult()); + response.getResult().forEach(webUpdate -> { assertNotEquals(0, webUpdate.getId()); assertNotNull(webUpdate.getTime()); assertNotNull(webUpdate.getInfo()); @@ -100,15 +110,14 @@ public class WebUpdateInfoControllerTest extends BaseTest { @Test public void page() throws Exception { - mockMvc.perform(get("/webUpdate/pages?page=1&count=10")).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - assertNotNull(object.getJSONObject(Result)); - PageData pageData = (PageData) JSONObject.toBean(object.getJSONObject(Result), PageData.class); + getMockData(get("/webUpdate/pages?page=1&count=10")).andDo(result -> { + Response> response = getResponse(result, MODAL_PAGE_TYPE); + assertEquals(SUCCESS.getCode(), response.getCode()); + assertNotNull(response.getResult()); + PageData pageData = response.getResult(); assertEquals(1, pageData.getPageNum()); assertEquals(10, pageData.getPageSize()); - for (Object o : pageData.getList()) { - WebUpdateModel model = (WebUpdateModel) JSONObject.toBean(JSONObject.fromObject(o), WebUpdateModel.class); + for (WebUpdateModel model : pageData.getList()) { assertNotEquals(0, model.getId()); assertNotNull(model.getTime()); assertNotNull(model.getInfo()); @@ -118,7 +127,6 @@ public class WebUpdateInfoControllerTest extends BaseTest { @Test public void lastestUpdateTime() throws Exception { - mockMvc.perform(get("/lastestUpdate")).andDo(result -> - assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); + getMockData(get("/lastestUpdate")).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result).getCode())); } } \ No newline at end of file diff --git a/src/test/java/cn/celess/blog/filter/AuthorizationFilter.java b/src/test/java/cn/celess/blog/filter/AuthorizationFilter.java index 0249fba..8747cde 100644 --- a/src/test/java/cn/celess/blog/filter/AuthorizationFilter.java +++ b/src/test/java/cn/celess/blog/filter/AuthorizationFilter.java @@ -1,12 +1,12 @@ package cn.celess.blog.filter; import cn.celess.blog.BaseTest; -import net.sf.json.JSONObject; +import cn.celess.blog.entity.Response; import org.junit.Test; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.junit.Assert.*; import static cn.celess.blog.enmu.ResponseEnum.*; +import static org.junit.Assert.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; /** * @Author: 小海 @@ -17,60 +17,37 @@ public class AuthorizationFilter extends BaseTest { @Test public void UserAccess() throws Exception { - String token = ""; // 未登录 - mockMvc.perform(get("/user/userInfo").header("Authorization", token)).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(HAVE_NOT_LOG_IN.getCode(), object.getInt(Code)); - }); - token = userLogin(); - mockMvc.perform(get("/user/userInfo").header("Authorization", token)).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - }); + getMockData(get("/user/userInfo")).andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), getResponse(result).getCode())); + // user权限登录 + getMockData(get("/user/userInfo"), userLogin()).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result).getCode())); } @Test public void AdminAccess() throws Exception { - String token = ""; // 未登录 - mockMvc.perform(get("/admin/articles?page=1&count=1").header("Authorization", token)).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(HAVE_NOT_LOG_IN.getCode(), object.getInt(Code)); - }); - token = userLogin(); - mockMvc.perform(get("/admin/articles?page=1&count=1").header("Authorization", token)).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(PERMISSION_ERROR.getCode(), object.getInt(Code)); - }); - token = adminLogin(); - mockMvc.perform(get("/admin/articles?page=1&count=1").header("Authorization", token)).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); - }); + getMockData(get("/admin/articles?page=1&count=1")).andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), getResponse(result).getCode())); + // user权限 + getMockData(get("/admin/articles?page=1&count=1"), userLogin()).andDo(result -> assertEquals(PERMISSION_ERROR.getCode(), getResponse(result).getCode())); + // admin 权限 + getMockData(get("/admin/articles?page=1&count=1"), adminLogin()).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result).getCode())); } @Test public void VisitorAccess() throws Exception { - mockMvc.perform(get("/user/userInfo")).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(HAVE_NOT_LOG_IN.getCode(), object.getInt(Code)); - }); - mockMvc.perform(get("/admin/articles?page=1&count=1")).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(HAVE_NOT_LOG_IN.getCode(), object.getInt(Code)); - }); + getMockData(get("/user/userInfo")).andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), getResponse(result).getCode())); + getMockData(get("/admin/articles?page=1&count=1")).andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), getResponse(result).getCode())); } @Test public void authorizationTest() throws Exception { // 测试response中有无Authorization字段 - String s = userLogin(); - mockMvc.perform(get("/user/userInfo").header("Authorization", s)).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - assertEquals(SUCCESS.getCode(), object.getInt(Code)); + String token = userLogin(); + getMockData(get("/user/userInfo"), token).andDo(result -> { + Response response = getResponse(result); + assertEquals(SUCCESS.getCode(), response.getCode()); assertNotNull(result.getResponse().getHeader("Authorization")); - assertNotEquals(s, result.getResponse().getHeader("Authorization")); + assertNotEquals(token, result.getResponse().getHeader("Authorization")); }); } } diff --git a/src/test/java/cn/celess/blog/filter/MultipleSubmitFilter.java b/src/test/java/cn/celess/blog/filter/MultipleSubmitFilter.java index 5eca79b..108550a 100644 --- a/src/test/java/cn/celess/blog/filter/MultipleSubmitFilter.java +++ b/src/test/java/cn/celess/blog/filter/MultipleSubmitFilter.java @@ -2,16 +2,11 @@ package cn.celess.blog.filter; import cn.celess.blog.BaseTest; import cn.celess.blog.enmu.ResponseEnum; -import net.sf.json.JSONObject; +import cn.celess.blog.entity.Response; import org.junit.Assert; import org.junit.Test; -import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockHttpSession; -import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.springframework.test.web.servlet.result.MockMvcResultHandlers; - -import javax.servlet.http.Cookie; /** * @Author: 小海 @@ -31,11 +26,11 @@ public class MultipleSubmitFilter extends BaseTest { private void sendRequest(ResponseEnum expectResponse, String... msg) throws Exception { - mockMvc.perform(MockMvcRequestBuilders.get("/counts").session(session)).andDo(result -> { - JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); - Assert.assertEquals(expectResponse.getCode(), object.getInt(Code)); + getMockData(MockMvcRequestBuilders.get("/counts").session(session)).andDo(result -> { + Response response = getResponse(result); + Assert.assertEquals(expectResponse.getCode(), response.getCode()); if (msg.length != 0) { - Assert.assertEquals(msg[0], object.getString("msg")); + Assert.assertEquals(msg[0], response.getMsg()); } }); } diff --git a/src/test/java/cn/celess/blog/mapper/ArticleMapperTest.java b/src/test/java/cn/celess/blog/mapper/ArticleMapperTest.java index 163eba4..b3183df 100644 --- a/src/test/java/cn/celess/blog/mapper/ArticleMapperTest.java +++ b/src/test/java/cn/celess/blog/mapper/ArticleMapperTest.java @@ -6,7 +6,6 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; -import java.util.UUID; import static org.junit.Assert.*; @@ -37,7 +36,7 @@ public class ArticleMapperTest extends BaseTest { @Test public void update() { Article article = generateArticle().getArticle(); - String randomText = UUID.randomUUID().toString(); + String randomText = randomStr(); // 此字段不会通过insert被写入数据库而是使用插入数据的默认值 数据库中该字段默认为true article.setOpen(true); @@ -117,7 +116,7 @@ public class ArticleMapperTest extends BaseTest { public void existsByTitle() { Article article = generateArticle().getArticle(); assertTrue(articleMapper.existsByTitle(article.getTitle())); - assertFalse(articleMapper.existsByTitle(UUID.randomUUID().toString())); + assertFalse(articleMapper.existsByTitle(randomStr())); } @Test @@ -196,7 +195,7 @@ public class ArticleMapperTest extends BaseTest { } private ArticleTag generateArticle() { - String randomText = UUID.randomUUID().toString(); + String randomText = randomStr(); Article article = new Article(); Category category = new Category(); diff --git a/src/test/java/cn/celess/blog/mapper/ArticleTagMapperTest.java b/src/test/java/cn/celess/blog/mapper/ArticleTagMapperTest.java index 72bb21f..6941f2d 100644 --- a/src/test/java/cn/celess/blog/mapper/ArticleTagMapperTest.java +++ b/src/test/java/cn/celess/blog/mapper/ArticleTagMapperTest.java @@ -5,9 +5,7 @@ import cn.celess.blog.entity.*; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import java.util.Iterator; import java.util.List; -import java.util.UUID; import static org.junit.Assert.*; @@ -111,7 +109,7 @@ public class ArticleTagMapperTest extends BaseTest { } private ArticleTag generateArticle() { - String randomText = UUID.randomUUID().toString(); + String randomText = randomStr(); Article article = new Article(); Category category = new Category(); diff --git a/src/test/java/cn/celess/blog/mapper/CategoryMapperTest.java b/src/test/java/cn/celess/blog/mapper/CategoryMapperTest.java index 3cdd172..4cf659d 100644 --- a/src/test/java/cn/celess/blog/mapper/CategoryMapperTest.java +++ b/src/test/java/cn/celess/blog/mapper/CategoryMapperTest.java @@ -5,7 +5,6 @@ import cn.celess.blog.entity.Category; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; diff --git a/src/test/java/cn/celess/blog/mapper/VisitorMapperTest.java b/src/test/java/cn/celess/blog/mapper/VisitorMapperTest.java index d782c94..1e2c78d 100644 --- a/src/test/java/cn/celess/blog/mapper/VisitorMapperTest.java +++ b/src/test/java/cn/celess/blog/mapper/VisitorMapperTest.java @@ -7,7 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.Date; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; public class VisitorMapperTest extends BaseTest { diff --git a/src/test/java/cn/celess/blog/util/DateFormatUtilTest.java b/src/test/java/cn/celess/blog/util/DateFormatUtilTest.java index f0b1b90..c1a8b8e 100644 --- a/src/test/java/cn/celess/blog/util/DateFormatUtilTest.java +++ b/src/test/java/cn/celess/blog/util/DateFormatUtilTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import java.util.Date; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; public class DateFormatUtilTest extends BaseTest { diff --git a/src/test/java/cn/celess/blog/util/HttpUtilTest.java b/src/test/java/cn/celess/blog/util/HttpUtilTest.java index 77dc9e0..544d0ab 100644 --- a/src/test/java/cn/celess/blog/util/HttpUtilTest.java +++ b/src/test/java/cn/celess/blog/util/HttpUtilTest.java @@ -1,13 +1,9 @@ package cn.celess.blog.util; import cn.celess.blog.BaseTest; -import cn.celess.blog.enmu.ResponseEnum; -import cn.celess.blog.entity.Response; import org.junit.Test; -import java.util.Map; - -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; public class HttpUtilTest extends BaseTest { diff --git a/src/test/java/cn/celess/blog/util/MD5UtilTest.java b/src/test/java/cn/celess/blog/util/MD5UtilTest.java index f9010c4..b8604a0 100644 --- a/src/test/java/cn/celess/blog/util/MD5UtilTest.java +++ b/src/test/java/cn/celess/blog/util/MD5UtilTest.java @@ -3,7 +3,7 @@ package cn.celess.blog.util; import cn.celess.blog.BaseTest; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class MD5UtilTest extends BaseTest {