zheng/blog-backEnd
1
0
Fork 0
Code Issues 5 Pull Requests 12 Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
禾几海
2020-08-15 16:08:44 +08:00
parent ee4c4bd87e 18a8c916c3
commit 4c9b193857
34 changed files with 1427 additions and 1616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@@ -76,14 +76,6 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!--Json-->
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
</dependency>
<!-- 七牛云SDK --> <!-- 七牛云SDK -->
<dependency> <dependency>
<groupId>com.qiniu</groupId> <groupId>com.qiniu</groupId>

4
src/main/java/cn/celess/blog/configuration/filter/AuthenticationFilter.java
View File

@@ -5,7 +5,7 @@ import cn.celess.blog.entity.Response;
import cn.celess.blog.service.UserService; import cn.celess.blog.service.UserService;
import cn.celess.blog.util.JwtUtil; import cn.celess.blog.util.JwtUtil;
import cn.celess.blog.util.RedisUtil; import cn.celess.blog.util.RedisUtil;
import net.sf.json.JSONObject; import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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"); response.setHeader("Content-Type", "application/json;charset=UTF-8");
try { try {
logger.info("鉴权失败，[code:{},msg:{},path:{}]", e.getCode(), e.getMsg(), request.getRequestURI() + "?" + request.getQueryString()); 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) { } catch (IOException ex) {
ex.printStackTrace(); ex.printStackTrace();
} }

18
src/main/java/cn/celess/blog/controller/ArticleController.java
View File

@@ -3,17 +3,15 @@ package cn.celess.blog.controller;
import cn.celess.blog.enmu.ResponseEnum; import cn.celess.blog.enmu.ResponseEnum;
import cn.celess.blog.entity.Response; import cn.celess.blog.entity.Response;
import cn.celess.blog.entity.model.ArticleModel; 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.entity.request.ArticleReq;
import cn.celess.blog.service.ArticleService; import cn.celess.blog.service.ArticleService;
import cn.celess.blog.util.RedisUserUtil; import cn.celess.blog.util.RedisUserUtil;
import cn.celess.blog.util.SitemapGenerateUtil; import cn.celess.blog.util.SitemapGenerateUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.stream.Collectors;
/** /**
* @author : xiaohai * @author : xiaohai
@@ -27,6 +25,8 @@ public class ArticleController {
SitemapGenerateUtil sitemapGenerateUtil; SitemapGenerateUtil sitemapGenerateUtil;
@Autowired @Autowired
RedisUserUtil redisUserUtil; RedisUserUtil redisUserUtil;
@Value("${spring.profiles.active}")
private String activeModel;
/** /**
* 新建一篇文章 * 新建一篇文章
@@ -37,7 +37,9 @@ public class ArticleController {
@PostMapping("/admin/article/create") @PostMapping("/admin/article/create")
public Response create(@RequestBody ArticleReq body) { public Response create(@RequestBody ArticleReq body) {
ArticleModel articleModel = articleService.create(body); ArticleModel articleModel = articleService.create(body);
sitemapGenerateUtil.createSitemap(); if ("prod".equals(activeModel)) {
sitemapGenerateUtil.createSitemap();
}
return Response.success(articleModel); return Response.success(articleModel);
} }
@@ -50,7 +52,9 @@ public class ArticleController {
@DeleteMapping("/admin/article/del") @DeleteMapping("/admin/article/del")
public Response delete(@RequestParam("articleID") long articleId) { public Response delete(@RequestParam("articleID") long articleId) {
boolean delete = articleService.delete(articleId); boolean delete = articleService.delete(articleId);
sitemapGenerateUtil.createSitemap(); if ("prod".equals(activeModel)) {
sitemapGenerateUtil.createSitemap();
}
return Response.success(delete); return Response.success(delete);
} }
@@ -63,7 +67,9 @@ public class ArticleController {
@PutMapping("/admin/article/update") @PutMapping("/admin/article/update")
public Response update(@RequestBody ArticleReq body) { public Response update(@RequestBody ArticleReq body) {
ArticleModel update = articleService.update(body); ArticleModel update = articleService.update(body);
sitemapGenerateUtil.createSitemap(); if ("prod".equals(activeModel)) {
sitemapGenerateUtil.createSitemap();
}
return Response.success(update); return Response.success(update);
} }

44
src/main/java/cn/celess/blog/controller/CommonController.java
View File

@@ -9,8 +9,8 @@ import cn.celess.blog.service.QiniuService;
import cn.celess.blog.util.HttpUtil; import cn.celess.blog.util.HttpUtil;
import cn.celess.blog.util.RedisUtil; import cn.celess.blog.util.RedisUtil;
import cn.celess.blog.util.VeriCodeUtil; import cn.celess.blog.util.VeriCodeUtil;
import net.sf.json.JSONArray; import com.fasterxml.jackson.databind.JsonNode;
import net.sf.json.JSONObject; import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -138,7 +138,8 @@ public class CommonController {
*/ */
@PostMapping("/imgUpload") @PostMapping("/imgUpload")
public void upload(HttpServletRequest request, HttpServletResponse response, @RequestParam("editormd-image-file") MultipartFile file) throws IOException { public void upload(HttpServletRequest request, HttpServletResponse response, @RequestParam("editormd-image-file") MultipartFile file) throws IOException {
JSONObject jsonObject = new JSONObject(); Map<String, Object> map = new HashMap<>();
ObjectMapper mapper = new ObjectMapper();
String uploadTimesStr = redisUtil.get(request.getRemoteAddr() + "-ImgUploadTimes"); String uploadTimesStr = redisUtil.get(request.getRemoteAddr() + "-ImgUploadTimes");
int uploadTimes = 0; int uploadTimes = 0;
if (uploadTimesStr != null) { if (uploadTimesStr != null) {
@@ -148,11 +149,11 @@ public class CommonController {
throw new MyException(ResponseEnum.FAILURE.getCode(), "上传次数已达10次，请2小时后在上传"); throw new MyException(ResponseEnum.FAILURE.getCode(), "上传次数已达10次，请2小时后在上传");
} }
request.setCharacterEncoding("utf-8"); request.setCharacterEncoding("utf-8");
response.setContentType("text/html"); response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
if (file.isEmpty()) { if (file.isEmpty()) {
jsonObject.put("success", 0); map.put("success", 0);
jsonObject.put("message", "上传失败，请选择文件"); map.put("message", "上传失败，请选择文件");
response.getWriter().println(jsonObject.toString()); response.getWriter().println(mapper.writeValueAsString(map));
return; return;
} }
String fileName = file.getOriginalFilename(); String fileName = file.getOriginalFilename();
@@ -161,25 +162,28 @@ public class CommonController {
if (".png".equals(mime.toLowerCase()) || ".jpg".equals(mime.toLowerCase()) || if (".png".equals(mime.toLowerCase()) || ".jpg".equals(mime.toLowerCase()) ||
".jpeg".equals(mime.toLowerCase()) || ".bmp".equals(mime.toLowerCase())) { ".jpeg".equals(mime.toLowerCase()) || ".bmp".equals(mime.toLowerCase())) {
QiniuResponse qiniuResponse = qiniuService.uploadFile(file.getInputStream(), "img_" + System.currentTimeMillis() + mime); QiniuResponse qiniuResponse = qiniuService.uploadFile(file.getInputStream(), "img_" + System.currentTimeMillis() + mime);
jsonObject.put("success", 1); map.put("success", 1);
jsonObject.put("message", "上传成功"); map.put("message", "上传成功");
jsonObject.put("url", "http://cdn.celess.cn/" + qiniuResponse.key); map.put("url", "http://cdn.celess.cn/" + qiniuResponse.key);
response.getWriter().println(jsonObject.toString()); response.getWriter().println(mapper.writeValueAsString(map));
redisUtil.setEx(request.getRemoteAddr() + "-ImgUploadTimes", uploadTimes + 1 + "", 2, TimeUnit.HOURS); redisUtil.setEx(request.getRemoteAddr() + "-ImgUploadTimes", uploadTimes + 1 + "", 2, TimeUnit.HOURS);
return; return;
} }
jsonObject.put("success", 0); map.put("success", 0);
jsonObject.put("message", "上传失败，请上传图片文件"); map.put("message", "上传失败，请上传图片文件");
response.getWriter().println(jsonObject.toString()); response.getWriter().println(mapper.writeValueAsString(map));
} }
@GetMapping("/bingPic") @GetMapping("/bingPic")
public Response bingPic() { public Response bingPic() {
ObjectMapper mapper = new ObjectMapper();
JSONObject imageObj; JsonNode root;
imageObj = JSONObject.fromObject(HttpUtil.get("https://cn.bing.com/HPImageArchive.aspx?format=js&idx=0&n=1&mkt=zh-CN")); try {
JSONArray jsonArray = imageObj.getJSONArray("images"); root = mapper.readTree(HttpUtil.get("https://cn.bing.com/HPImageArchive.aspx?format=js&idx=0&n=1&mkt=zh-CN"));
String imageName = jsonArray.getJSONObject(0).getString("url"); } catch (IOException e) {
return Response.success("https://cn.bing.com" + imageName); return Response.failure(null);
}
JsonNode images = root.get("images").elements().next();
return Response.success("https://cn.bing.com" + images.get("url").asText());
} }
} }

6
src/main/java/cn/celess/blog/controller/LinksController.java
View File

@@ -1,24 +1,18 @@
package cn.celess.blog.controller; package cn.celess.blog.controller;
import cn.celess.blog.enmu.ResponseEnum;
import cn.celess.blog.entity.PartnerSite; import cn.celess.blog.entity.PartnerSite;
import cn.celess.blog.entity.Response; import cn.celess.blog.entity.Response;
import cn.celess.blog.entity.request.LinkApplyReq; import cn.celess.blog.entity.request.LinkApplyReq;
import cn.celess.blog.entity.request.LinkReq; import cn.celess.blog.entity.request.LinkReq;
import cn.celess.blog.exception.MyException;
import cn.celess.blog.service.MailService; import cn.celess.blog.service.MailService;
import cn.celess.blog.service.PartnerSiteService; import cn.celess.blog.service.PartnerSiteService;
import cn.celess.blog.util.DateFormatUtil;
import cn.celess.blog.util.RedisUtil; import cn.celess.blog.util.RedisUtil;
import cn.celess.blog.util.RegexUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mail.SimpleMailMessage;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
/** /**
* @author : xiaohai * @author : xiaohai

13
src/main/java/cn/celess/blog/controller/TagController.java
View File

@@ -3,12 +3,13 @@ package cn.celess.blog.controller;
import cn.celess.blog.entity.Response; import cn.celess.blog.entity.Response;
import cn.celess.blog.entity.model.TagModel; import cn.celess.blog.entity.model.TagModel;
import cn.celess.blog.service.TagService; import cn.celess.blog.service.TagService;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @author : xiaohai * @author : xiaohai
@@ -44,13 +45,13 @@ public class TagController {
@GetMapping("/tags/nac") @GetMapping("/tags/nac")
public Response getTagNameAndCount() { public Response getTagNameAndCount() {
List<JSONObject> nameAndCount = new ArrayList<>(); List<Map<String, Object>> nameAndCount = new ArrayList<>();
List<TagModel> all = tagService.findAll(); List<TagModel> all = tagService.findAll();
for (TagModel t : all) { for (TagModel t : all) {
JSONObject jsonObject = new JSONObject(); Map<String, Object> map = new HashMap<>(2);
jsonObject.put("name", t.getName()); map.put("name", t.getName());
jsonObject.put("size", t.getArticles().size()); map.put("size", t.getArticles().size());
nameAndCount.add(jsonObject); nameAndCount.add(map);
} }
return Response.success(nameAndCount); return Response.success(nameAndCount);
} }

7
src/main/java/cn/celess/blog/entity/Response.java
View File

@@ -1,8 +1,9 @@
package cn.celess.blog.entity; package cn.celess.blog.entity;
import cn.celess.blog.enmu.ResponseEnum; import cn.celess.blog.enmu.ResponseEnum;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.Data; import lombok.Data;
import net.sf.json.JSONObject; import lombok.SneakyThrows;
import java.io.Serializable; import java.io.Serializable;
@@ -56,9 +57,9 @@ public class Response<T> implements Serializable {
return new Response(r.getCode(), r.getMsg(), result); return new Response(r.getCode(), r.getMsg(), result);
} }
@SneakyThrows
@Override @Override
public String toString() { public String toString() {
JSONObject jsonObject = JSONObject.fromObject(this); return new ObjectMapper().writeValueAsString(this);
return jsonObject.toString();
} }
} }

4
src/main/java/cn/celess/blog/entity/request/LoginReq.java
View File

@@ -1,12 +1,16 @@
package cn.celess.blog.entity.request; package cn.celess.blog.entity.request;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
/** /**
* @author : xiaohai * @author : xiaohai
* @date : 2019/06/01 22:47 * @date : 2019/06/01 22:47
*/ */
@Data @Data
@NoArgsConstructor
@AllArgsConstructor
public class LoginReq { public class LoginReq {
private String email; private String email;
private String password; private String password;

4
src/main/java/cn/celess/blog/service/WebUpdateInfoService.java
View File

@@ -2,10 +2,10 @@ package cn.celess.blog.service;
import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.model.PageData;
import cn.celess.blog.entity.model.WebUpdateModel; import cn.celess.blog.entity.model.WebUpdateModel;
import net.sf.json.JSONObject;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @author : xiaohai * @author : xiaohai
@@ -59,5 +59,5 @@ public interface WebUpdateInfoService {
* *
* @return * @return
*/ */
JSONObject getLastestUpdateTime(); Map<String, Object> getLastestUpdateTime();
} }

1
src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java
View File

@@ -22,7 +22,6 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import sun.security.krb5.internal.PAData;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList; import java.util.ArrayList;

3
src/main/java/cn/celess/blog/service/serviceimpl/PartnerSiteServiceImpl.java
View File

@@ -10,14 +10,13 @@ import cn.celess.blog.mapper.PartnerMapper;
import cn.celess.blog.service.MailService; import cn.celess.blog.service.MailService;
import cn.celess.blog.service.PartnerSiteService; import cn.celess.blog.service.PartnerSiteService;
import cn.celess.blog.util.HttpUtil; import cn.celess.blog.util.HttpUtil;
import cn.celess.blog.util.JwtUtil;
import cn.celess.blog.util.RedisUtil; import cn.celess.blog.util.RedisUtil;
import cn.celess.blog.util.RegexUtil; import cn.celess.blog.util.RegexUtil;
import com.alibaba.druid.util.StringUtils;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.SimpleMailMessage;

10
src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java
View File

@@ -17,8 +17,6 @@ import cn.celess.blog.service.UserService;
import cn.celess.blog.util.*; import cn.celess.blog.util.*;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -28,9 +26,7 @@ import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.beans.Transient; import java.beans.Transient;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
@@ -312,14 +308,14 @@ public class UserServiceImpl implements UserService {
@Override @Override
public Object deleteUser(Integer[] id) { public Object deleteUser(Integer[] id) {
JSONArray status = new JSONArray(); List<Map<String, Object>> status = new ArrayList<>();
if (id == null || id.length == 0) { if (id == null || id.length == 0) {
return null; return null;
} }
for (Integer integer : id) { for (Integer integer : id) {
String role = userMapper.getRoleById(integer); String role = userMapper.getRoleById(integer);
int deleteResult = 0; int deleteResult = 0;
JSONObject deleteStatus = new JSONObject(); Map<String, Object> deleteStatus = new HashMap<>(3);
deleteStatus.put("id", integer); deleteStatus.put("id", integer);
// 管理员账户不可删 // 管理员账户不可删
if ("admin".equals(role)) { if ("admin".equals(role)) {

8
src/main/java/cn/celess/blog/service/serviceimpl/VisitorServiceImpl.java
View File

@@ -15,7 +15,6 @@ import eu.bitwalker.useragentutils.Browser;
import eu.bitwalker.useragentutils.OperatingSystem; import eu.bitwalker.useragentutils.OperatingSystem;
import eu.bitwalker.useragentutils.UserAgent; import eu.bitwalker.useragentutils.UserAgent;
import eu.bitwalker.useragentutils.Version; import eu.bitwalker.useragentutils.Version;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.json.JsonParserFactory; import org.springframework.boot.json.JsonParserFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -26,6 +25,8 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@@ -67,8 +68,9 @@ public class VisitorServiceImpl implements VisitorService {
visitor.setUa(request.getHeader("User-Agent")); visitor.setUa(request.getHeader("User-Agent"));
//记录当日的访问 //记录当日的访问
String dayVisitCount = redisUtil.get("dayVisitCount"); 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) { if (dayVisitCount == null) {
redisUtil.setEx("dayVisitCount", "1", secondsLeftToday, TimeUnit.SECONDS); redisUtil.setEx("dayVisitCount", "1", secondsLeftToday, TimeUnit.SECONDS);
} else { } else {

48
src/main/java/cn/celess/blog/service/serviceimpl/WebUpdateInfoServiceImpl.java
View File

@@ -10,19 +10,18 @@ import cn.celess.blog.service.WebUpdateInfoService;
import cn.celess.blog.util.DateFormatUtil; import cn.celess.blog.util.DateFormatUtil;
import cn.celess.blog.util.HttpUtil; import cn.celess.blog.util.HttpUtil;
import cn.celess.blog.util.ModalTrans; 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.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.io.IOException;
import java.time.Instant; import java.time.Instant;
import java.util.ArrayList; import java.util.*;
import java.util.Date;
import java.util.List;
/** /**
* @author : xiaohai * @author : xiaohai
@@ -83,22 +82,29 @@ public class WebUpdateInfoServiceImpl implements WebUpdateInfoService {
} }
@Override @Override
public JSONObject getLastestUpdateTime() {
JSONObject jsonObject = new JSONObject(); public Map<String, Object> getLastestUpdateTime() {
jsonObject.put("lastUpdateTime", DateFormatUtil.get(webUpdateInfoMapper.getLastestOne().getUpdateTime())); Map<String, Object> map = new HashMap<>();
jsonObject.put("lastUpdateInfo", webUpdateInfoMapper.getLastestOne().getUpdateInfo()); map.put("lastUpdateTime", DateFormatUtil.get(webUpdateInfoMapper.getLastestOne().getUpdateTime()));
String str = HttpUtil.get("https://api.github.com/repos/xiaohai2271/blog-frontEnd/commits?page=1&per_page=1"); map.put("lastUpdateInfo", webUpdateInfoMapper.getLastestOne().getUpdateInfo());
if (!StringUtils.isEmpty(str)) { try {
JSONArray array = JSONArray.fromObject(str); ObjectMapper mapper = new ObjectMapper();
JSONObject object = array.getJSONObject(0); String respStr = HttpUtil.get("https://api.github.com/repos/xiaohai2271/blog-frontEnd/commits?page=1&per_page=1");
JSONObject commit = object.getJSONObject("commit"); if (!StringUtils.isEmpty(respStr)) {
jsonObject.put("lastCommit", commit.getString("message")); JsonNode root = mapper.readTree(respStr);
jsonObject.put("committerAuthor", commit.getJSONObject("committer").getString("name")); Iterator<JsonNode> elements = root.elements();
Instant parse = Instant.parse(commit.getJSONObject("committer").getString("date")); JsonNode next = elements.next();
jsonObject.put("committerDate", DateFormatUtil.get(Date.from(parse))); JsonNode commit = next.get("commit");
jsonObject.put("commitUrl", "https://github.com/xiaohai2271/blog-frontEnd/tree/" + object.getString("sha")); 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 jsonObject; return map;
} }
private List<WebUpdateModel> list2List(List<WebUpdate> webUpdates) { private List<WebUpdateModel> list2List(List<WebUpdate> webUpdates) {

12
src/main/java/cn/celess/blog/util/RedisUserUtil.java
View File

@@ -3,7 +3,8 @@ package cn.celess.blog.util;
import cn.celess.blog.enmu.ResponseEnum; import cn.celess.blog.enmu.ResponseEnum;
import cn.celess.blog.entity.User; import cn.celess.blog.entity.User;
import cn.celess.blog.exception.MyException; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -31,24 +32,27 @@ public class RedisUserUtil {
return user; return user;
} }
@SneakyThrows
public User getWithOutExc() { public User getWithOutExc() {
String token = request.getHeader("Authorization"); String token = request.getHeader("Authorization");
if (token == null || token.isEmpty()) { if (token == null || token.isEmpty()) {
return null; return null;
} }
String email = jwtUtil.getUsernameFromToken(token); 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) { public User set(User user) {
Long expire = redisUtil.getExpire(user.getEmail() + "-login"); 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); expire > 0 ? expire : JwtUtil.EXPIRATION_SHORT_TIME, TimeUnit.MILLISECONDS);
return user; return user;
} }
@SneakyThrows
public User set(User user, boolean isRemember) { 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); isRemember ? JwtUtil.EXPIRATION_LONG_TIME : JwtUtil.EXPIRATION_SHORT_TIME, TimeUnit.MILLISECONDS);
request.getSession().setAttribute("email", user.getEmail()); request.getSession().setAttribute("email", user.getEmail());
return user; return user;

15
src/test/java/cn/celess/blog/BaseTest.java
View File

@@ -33,7 +33,6 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde
import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.WebApplicationContext;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
@@ -64,6 +63,9 @@ public class BaseTest {
protected MockMvc mockMvc; protected MockMvc mockMvc;
protected final static String Code = "code"; protected final static String Code = "code";
protected final static String Result = "result"; 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 * jackson 序列化/反序列化Json
*/ */
@@ -76,6 +78,7 @@ public class BaseTest {
}; };
protected static final TypeReference<?> MAP_OBJECT_TYPE = new TypeReference<Response<Map<String, Object>>>() { protected static final TypeReference<?> MAP_OBJECT_TYPE = new TypeReference<Response<Map<String, Object>>>() {
}; };
@Autowired @Autowired
private WebApplicationContext wac; private WebApplicationContext wac;
protected MockHttpSession session; protected MockHttpSession session;
@@ -99,7 +102,7 @@ public class BaseTest {
*/ */
protected String adminLogin() { protected String adminLogin() {
LoginReq req = new LoginReq(); LoginReq req = new LoginReq();
req.setEmail("a@celess.cn"); req.setEmail(ADMIN_EMAIL);
req.setPassword("123456789"); req.setPassword("123456789");
req.setIsRememberMe(true); req.setIsRememberMe(true);
String token = login(req); String token = login(req);
@@ -114,7 +117,7 @@ public class BaseTest {
*/ */
protected String userLogin() { protected String userLogin() {
LoginReq req = new LoginReq(); LoginReq req = new LoginReq();
req.setEmail("zh56462271@qq.com"); req.setEmail(USERE_MAIL);
req.setPassword("123456789"); req.setPassword("123456789");
req.setIsRememberMe(true); req.setIsRememberMe(true);
String token = login(req); String token = login(req);
@@ -128,7 +131,7 @@ public class BaseTest {
* @param req 用户信息 * @param req 用户信息
* @return token | null * @return token | null
*/ */
private String login(LoginReq req) { protected String login(LoginReq req) {
String str = null; String str = null;
try { try {
str = getMockData(post("/login"), null, req) str = getMockData(post("/login"), null, req)
@@ -220,6 +223,7 @@ public class BaseTest {
} }
if (content != null) { if (content != null) {
builder.content(mapper.writeValueAsString(content)).contentType(MediaType.APPLICATION_JSON); builder.content(mapper.writeValueAsString(content)).contentType(MediaType.APPLICATION_JSON);
logger.debug("param::json->{}", mapper.writeValueAsString(content));
} }
return mockMvc.perform(builder).andExpect(status().isOk()); return mockMvc.perform(builder).andExpect(status().isOk());
} }
@@ -242,7 +246,6 @@ public class BaseTest {
*/ */
protected <T> Response<T> getResponse(String json, TypeReference<?> responseType) { protected <T> Response<T> getResponse(String json, TypeReference<?> responseType) {
Response<T> response = null; Response<T> response = null;
System.out.println(responseType.getType());
try { try {
response = mapper.readValue(json, responseType); response = mapper.readValue(json, responseType);
} catch (IOException e) { } catch (IOException e) {
@@ -280,6 +283,7 @@ public class BaseTest {
protected void mockInjectInstance(Object service, String mailFiledName, Object impl) { protected void mockInjectInstance(Object service, String mailFiledName, Object impl) {
Field field; Field field;
try { try {
assertNotNull(service);
field = service.getClass().getDeclaredField(mailFiledName); field = service.getClass().getDeclaredField(mailFiledName);
field.setAccessible(true); field.setAccessible(true);
field.set(service, impl); field.set(service, impl);
@@ -340,5 +344,4 @@ public class BaseTest {
return new FileInfo[0]; return new FileInfo[0];
} }
} }
} }

2
src/test/java/cn/celess/blog/RedisServerMock.java
View File

@@ -1,7 +1,7 @@
package cn.celess.blog; package cn.celess.blog;
import redis.embedded.RedisServer;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import redis.embedded.RedisServer;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;

333
src/test/java/cn/celess/blog/controller/ArticleControllerTest.java
View File

@@ -9,29 +9,30 @@ import cn.celess.blog.entity.model.PageData;
import cn.celess.blog.entity.request.ArticleReq; import cn.celess.blog.entity.request.ArticleReq;
import cn.celess.blog.mapper.ArticleMapper; import cn.celess.blog.mapper.ArticleMapper;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import net.sf.json.JSONObject;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; 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.junit.Assert.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; 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 { public class ArticleControllerTest extends BaseTest {
@Autowired @Autowired
ArticleMapper articleMapper; ArticleMapper articleMapper;
private static final TypeReference<?> ARTICLE_MODEL_TYPE = new TypeReference<Response<ArticleModel>>() {
};
private static final TypeReference<?> ARTICLE_MODEL_PAGE_TYPE = new TypeReference<Response<PageData<ArticleModel>>>() {
};
@Test @Test
public void create() { public void create() {
ArticleReq articleReq = new ArticleReq(); ArticleReq articleReq = new ArticleReq();
// 应该正常通过 // 应该正常通过
articleReq.setTitle("test-" + UUID.randomUUID().toString()); articleReq.setTitle("test-" + randomStr());
articleReq.setMdContent("# test title"); articleReq.setMdContent("# test title");
articleReq.setCategory("随笔"); articleReq.setCategory("随笔");
String[] tagList = {"tag", "category"}; String[] tagList = {"tag", "category"};
@@ -39,58 +40,29 @@ public class ArticleControllerTest extends BaseTest {
articleReq.setOpen(true); articleReq.setOpen(true);
articleReq.setType(true); articleReq.setType(true);
articleReq.setUrl("http://xxxx.com"); articleReq.setUrl("http://xxxx.com");
JSONObject jsonObject = JSONObject.fromObject(articleReq); MockHttpServletRequestBuilder post = post("/admin/article/create");
try { try {
// 未登录 getMockData(post, adminLogin(), articleReq).andDo(result -> {
mockMvc.perform(post("/admin/article/create") Response<ArticleModel> response = getResponse(result, ARTICLE_MODEL_TYPE);
.content(jsonObject.toString()) assertEquals(SUCCESS.getCode(), response.getCode());
.contentType("application/json")) assertNotNull(response.getResult());
.andExpect(status().isOk()) ArticleModel articleModel = response.getResult();
.andDo(result -> { assertNotNull(articleModel.getId());
assertEquals(HAVE_NOT_LOG_IN.getCode(), assertNotNull(articleModel.getTitle());
JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code) assertNotNull(articleModel.getSummary());
); assertNotNull(articleModel.getOriginal());
}); assertNotNull(articleModel.getTags());
// User权限 assertNotNull(articleModel.getCategory());
String token = userLogin(); assertNotNull(articleModel.getPublishDateFormat());
mockMvc.perform(post("/admin/article/create") assertNotNull(articleModel.getMdContent());
.content(jsonObject.toString()) assertNotNull(articleModel.getPreArticle());
.contentType("application/json") assertNull(articleModel.getNextArticle());
.header("Authorization", token)) assertNotNull(articleModel.getOpen());
.andExpect(status().isOk()) assertNotNull(articleModel.getReadingNumber());
.andDo(result -> { assertNotNull(articleModel.getAuthor());
assertEquals(PERMISSION_ERROR.getCode(), assertNotNull(articleModel.getUrl());
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());
});
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -98,33 +70,22 @@ public class ArticleControllerTest extends BaseTest {
@Test @Test
public void delete() { 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 { try {
// 未登录删除文章 Article finalArticle = article;
mockMvc.perform(MockMvcRequestBuilders.delete("/admin/article/del?articleID=" + article.getId()) getMockData(delete, adminLogin()).andDo(result -> {
).andDo(result -> { Response<Boolean> response = getResponse(result, BOOLEAN_TYPE);
assertEquals(HAVE_NOT_LOG_IN.getCode(), assertEquals(SUCCESS.getCode(), response.getCode());
JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code) // 断言删除成功
); 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) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -146,27 +107,21 @@ public class ArticleControllerTest extends BaseTest {
articleReq.setTags(tagList); articleReq.setTags(tagList);
articleReq.setTitle("test-" + article.getTitle()); articleReq.setTitle("test-" + article.getTitle());
try { try {
// Admin 权限 getMockData(put("/admin/article/update"), adminLogin(), articleReq).andDo(result -> {
mockMvc.perform(put("/admin/article/update") Response<ArticleModel> response = getResponse(result, ARTICLE_MODEL_TYPE);
.content(JSONObject.fromObject(articleReq).toString()) assertEquals(SUCCESS.getCode(), response.getCode());
.contentType("application/json") ArticleModel a = response.getResult();
.header("Authorization", adminLogin())) assertEquals(articleReq.getCategory(), a.getCategory());
.andExpect(status().isOk()) assertEquals(articleReq.getUrl(), a.getUrl());
.andDo(result -> { assertEquals(articleReq.getMdContent(), a.getMdContent());
JSONObject jsonObject = JSONObject.fromObject(result.getResponse().getContentAsString()); assertEquals(articleReq.getTitle(), a.getTitle());
assertEquals(SUCCESS.getCode(), jsonObject.getInt(Code)); assertEquals(articleReq.getType(), a.getOriginal());
ArticleModel a = (ArticleModel) JSONObject.toBean(jsonObject.getJSONObject(Result), ArticleModel.class); // Tag
assertEquals(articleReq.getCategory(), a.getCategory()); List<Tag> asList = a.getTags();
assertEquals(articleReq.getUrl(), a.getUrl()); assertEquals(3, asList.size());
assertEquals(articleReq.getMdContent(), a.getMdContent()); assertEquals(articleReq.getOpen(), a.getOpen());
assertEquals(articleReq.getTitle(), a.getTitle()); assertEquals(articleReq.getId(), a.getId());
assertEquals(articleReq.getType(), a.getOriginal()); });
// Tag
List<Tag> asList = a.getTags();
assertEquals(3, asList.size());
assertEquals(articleReq.getOpen(), a.getOpen());
assertEquals(articleReq.getId(), a.getId());
});
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -176,43 +131,35 @@ public class ArticleControllerTest extends BaseTest {
public void retrieveOneById() { public void retrieveOneById() {
try { try {
long articleID = 3; long articleID = 3;
mockMvc.perform(MockMvcRequestBuilders.get("/article/articleID/" + articleID)) getMockData(MockMvcRequestBuilders.get("/article/articleID/" + articleID));
.andExpect(status().is(200)); getMockData(MockMvcRequestBuilders.get("/article/articleID/" + articleID + "?update=true"));
mockMvc.perform(MockMvcRequestBuilders.get("/article/articleID/" + articleID + "?update=true"))
.andExpect(status().is(200));
// 文章不存在 // 文章不存在
mockMvc.perform(MockMvcRequestBuilders.get("/article/articleID/-1")) getMockData(MockMvcRequestBuilders.get("/article/articleID/-1"))
.andExpect(status().is(200)) .andDo(result -> assertEquals(ARTICLE_NOT_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode()));
.andDo(result -> {
JSONObject jsonObject = JSONObject.fromObject(result.getResponse().getContentAsString());
assertEquals(ARTICLE_NOT_EXIST.getCode(), jsonObject.getInt(Code));
});
// 正常情况 // 正常情况
mockMvc.perform(MockMvcRequestBuilders.get("/article/articleID/" + articleID + "?update=false")) getMockData(MockMvcRequestBuilders.get("/article/articleID/" + articleID + "?update=false")).andDo(result -> {
.andExpect(status().is(200)) Response<ArticleModel> response = getResponse(result, ARTICLE_MODEL_TYPE);
.andDo(result -> { // 断言获取数据成功
JSONObject articleJson = JSONObject.fromObject(result.getResponse().getContentAsString()); assertEquals(SUCCESS.getCode(), response.getCode());
// 断言获取数据成功 assertNotNull(response.getResult());
assertEquals(SUCCESS.getCode(), articleJson.getInt(Code));
assertNotNull(articleJson.getJSONObject(Result));
ArticleModel a = (ArticleModel) JSONObject.toBean(articleJson.getJSONObject(Result), ArticleModel.class); ArticleModel a = response.getResult();
assertNotNull(a.getTitle()); assertNotNull(a.getTitle());
assertNotNull(a.getId()); assertNotNull(a.getId());
assertNotNull(a.getSummary()); assertNotNull(a.getSummary());
assertNotNull(a.getMdContent()); assertNotNull(a.getMdContent());
assertNotNull(a.getUrl()); assertNotNull(a.getUrl());
assertNotNull(a.getUpdateDateFormat()); assertNotNull(a.getUpdateDateFormat());
assertTrue(a.getPreArticle() != null || a.getNextArticle() != null); assertTrue(a.getPreArticle() != null || a.getNextArticle() != null);
assertNotNull(a.getReadingNumber()); assertNotNull(a.getReadingNumber());
assertNotNull(a.getOriginal()); assertNotNull(a.getOriginal());
assertNotNull(a.getPublishDateFormat()); assertNotNull(a.getPublishDateFormat());
assertNotNull(a.getCategory()); assertNotNull(a.getCategory());
assertNotNull(a.getTags()); assertNotNull(a.getTags());
assertNotNull(a.getAuthor()); assertNotNull(a.getAuthor());
}); });
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -222,39 +169,32 @@ public class ArticleControllerTest extends BaseTest {
public void articles() { public void articles() {
try { try {
// 测试不带参数访问 // 测试不带参数访问
mockMvc.perform(MockMvcRequestBuilders.get("/articles")) getMockData(MockMvcRequestBuilders.get("/articles"));
.andExpect(status().is(200)); getMockData(MockMvcRequestBuilders.get("/articles?page=1&count=5")).andDo(result -> {
Response<PageData<ArticleModel>> response = getResponse(result, ARTICLE_MODEL_PAGE_TYPE);
mockMvc.perform(MockMvcRequestBuilders.get("/articles?page=1&count=5")) // 断言获取数据成功
.andExpect(status().is(200)) assertEquals(SUCCESS.getCode(), response.getCode());
.andDo(result -> { // 结果集非空
JSONObject articlesJSON = JSONObject.fromObject(result.getResponse().getContentAsString()); assertNotNull(response.getResult());
Response response = (Response) JSONObject.toBean(articlesJSON, Response.class); // 判断pageInfo是否包装完全
// 断言获取数据成功 PageData<ArticleModel> pageData = response.getResult();
assertEquals(SUCCESS.getCode(), response.getCode()); assertNotEquals(0, pageData.getTotal());
// 结果集非空 assertEquals(1, pageData.getPageNum());
assertNotNull(response.getResult()); assertEquals(5, pageData.getPageSize());
// 判断pageInfo是否包装完全 // 内容完整
JSONObject resultJson = JSONObject.fromObject(response.getResult()); for (ArticleModel a : pageData.getList()) {
PageData<ArticleModel> pageData = (PageData<ArticleModel>) JSONObject.toBean(resultJson, PageData.class); assertNotNull(a.getTitle());
assertNotEquals(0, pageData.getTotal()); assertNotNull(a.getId());
assertEquals(1, pageData.getPageNum()); assertNotNull(a.getSummary());
assertEquals(5, pageData.getPageSize()); assertNotNull(a.getOriginal());
// 内容完整 assertNotNull(a.getPublishDateFormat());
for (Object arc : pageData.getList()) { assertNotNull(a.getCategory());
ArticleModel a = (ArticleModel) JSONObject.toBean(JSONObject.fromObject(arc), ArticleModel.class); assertNotNull(a.getTags());
assertNotNull(a.getTitle()); assertNotNull(a.getAuthor());
assertNotNull(a.getId()); assertNull(a.getOpen());
assertNotNull(a.getSummary()); assertNull(a.getMdContent());
assertNotNull(a.getOriginal()); }
assertNotNull(a.getPublishDateFormat()); });
assertNotNull(a.getCategory());
assertNotNull(a.getTags());
assertNotNull(a.getAuthor());
assertNull(a.getOpen());
assertNull(a.getMdContent());
}
});
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -264,19 +204,18 @@ public class ArticleControllerTest extends BaseTest {
public void adminArticles() { public void adminArticles() {
try { try {
getMockData(get("/admin/articles?page=1&count=10")).andExpect(result -> 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权限登陆 // User权限登陆
getMockData(get("/admin/articles?page=1&count=10"), userLogin()).andDo(result -> 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++) { for (int i = 0; i < 2; i++) {
// admin权限登陆 // admin权限登陆
int finalI = i; int finalI = i;
getMockData(get("/admin/articles?page=1&count=10&deleted=" + (i == 1)), adminLogin()).andDo(result -> { getMockData(get("/admin/articles?page=1&count=10&deleted=" + (i == 1)), adminLogin()).andDo(result -> {
Response<PageData<ArticleModel>> response = mapper.readValue(result.getResponse().getContentAsString(), new TypeReference<Response<PageData<ArticleModel>>>() { Response<PageData<ArticleModel>> response = getResponse(result, ARTICLE_MODEL_PAGE_TYPE);
});
assertEquals(SUCCESS.getCode(), response.getCode()); assertEquals(SUCCESS.getCode(), response.getCode());
assertNotNull(response.getResult()); assertNotNull(response.getResult());
// 判断pageInfo是否包装完全 // 判断pageInfo是否包装完全
@@ -309,27 +248,22 @@ public class ArticleControllerTest extends BaseTest {
try { try {
// 分类不存在 // 分类不存在
String categoryName = "NoSuchCategory"; String categoryName = "NoSuchCategory";
mockMvc.perform(MockMvcRequestBuilders.get("/articles/category/" + categoryName + "?page=1&count=10")) getMockData(MockMvcRequestBuilders.get("/articles/category/" + categoryName + "?page=1&count=10"))
.andExpect(status().is(200)) .andDo(result -> assertEquals(CATEGORY_NOT_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode()));
.andDo(result -> {
assertEquals(CATEGORY_NOT_EXIST.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code));
});
// 正常查询 // 正常查询
categoryName = "linux"; categoryName = "linux";
mockMvc.perform(MockMvcRequestBuilders.get("/articles/category/" + categoryName + "?page=1&count=10")) getMockData(MockMvcRequestBuilders.get("/articles/category/" + categoryName + "?page=1&count=10"))
.andExpect(status().is(200))
.andDo(result -> { .andDo(result -> {
JSONObject jsonObject = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<PageData<ArticleModel>> response = getResponse(result, ARTICLE_MODEL_PAGE_TYPE);
assertEquals(SUCCESS.getCode(), jsonObject.getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
PageData<ArticleModel> pageData = (PageData<ArticleModel>) JSONObject.toBean(jsonObject.getJSONObject(Result), PageData.class); PageData<ArticleModel> pageData = response.getResult();
assertNotEquals(0, pageData.getTotal()); assertNotEquals(0, pageData.getTotal());
assertEquals(1, pageData.getPageNum()); assertEquals(1, pageData.getPageNum());
assertEquals(10, pageData.getPageSize()); assertEquals(10, pageData.getPageSize());
for (Object arc : pageData.getList()) { for (ArticleModel arc : pageData.getList()) {
JSONObject jsonObject1 = JSONObject.fromObject(arc); assertNotEquals(0, arc.getId().longValue());
assertNotEquals(0, jsonObject1.getInt("id")); assertNotNull(arc.getTitle());
assertNotNull(jsonObject1.getString("title")); assertNotNull(arc.getSummary());
assertNotNull(jsonObject1.getString("summary"));
} }
}); });
} catch (Exception e) { } catch (Exception e) {
@@ -342,28 +276,23 @@ public class ArticleControllerTest extends BaseTest {
try { try {
// 分类不存在 // 分类不存在
String tagName = "NoSuchTag"; String tagName = "NoSuchTag";
mockMvc.perform(MockMvcRequestBuilders.get("/articles/tag/" + tagName + "?page=1&count=10")) getMockData(MockMvcRequestBuilders.get("/articles/tag/" + tagName + "?page=1&count=10"))
.andExpect(status().is(200)) .andDo(result -> assertEquals(TAG_NOT_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode()));
.andDo(result -> {
assertEquals(TAG_NOT_EXIST.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code));
});
// 正常查询 // 正常查询
tagName = "linux"; tagName = "linux";
mockMvc.perform(MockMvcRequestBuilders.get("/articles/tag/" + tagName + "?page=1&count=10")) getMockData(MockMvcRequestBuilders.get("/articles/tag/" + tagName + "?page=1&count=10"))
.andExpect(status().is(200))
.andDo(result -> { .andDo(result -> {
JSONObject jsonObject = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<PageData<ArticleModel>> response = getResponse(result, ARTICLE_MODEL_PAGE_TYPE);
assertEquals(SUCCESS.getCode(), jsonObject.getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
PageData<ArticleModel> pageData = (PageData<ArticleModel>) JSONObject.toBean(jsonObject.getJSONObject(Result), PageData.class); PageData<ArticleModel> pageData = response.getResult();
assertNotEquals(0, pageData.getTotal()); assertNotEquals(0, pageData.getTotal());
assertEquals(1, pageData.getPageNum()); assertEquals(1, pageData.getPageNum());
assertEquals(10, pageData.getPageSize()); assertEquals(10, pageData.getPageSize());
for (Object arc : pageData.getList()) { for (ArticleModel arc : pageData.getList()) {
JSONObject jsonObject1 = JSONObject.fromObject(arc); assertNotEquals(0, arc.getId().longValue());
assertNotEquals(0, jsonObject1.getInt("id")); assertNotNull(arc.getTitle());
assertNotNull(jsonObject1.getString("title")); assertNotNull(arc.getSummary());
assertNotNull(jsonObject1.getString("summary"));
} }
}); });
} catch (Exception e) { } catch (Exception e) {

135
src/test/java/cn/celess/blog/controller/CategoryControllerTest.java
View File

@@ -2,132 +2,77 @@ package cn.celess.blog.controller;
import cn.celess.blog.BaseTest; import cn.celess.blog.BaseTest;
import cn.celess.blog.entity.Category; 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.CategoryModel;
import cn.celess.blog.entity.model.PageData;
import cn.celess.blog.mapper.CategoryMapper; import cn.celess.blog.mapper.CategoryMapper;
import net.sf.json.JSONArray; import com.fasterxml.jackson.core.type.TypeReference;
import net.sf.json.JSONObject;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; 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.junit.Assert.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; 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 { public class CategoryControllerTest extends BaseTest {
@Autowired @Autowired
CategoryMapper categoryMapper; CategoryMapper categoryMapper;
private static final TypeReference<?> CATEGORY_MODEL_TYPE = new TypeReference<Response<CategoryModel>>() {
};
private static final TypeReference<?> CATEGORY_MODEL_PAGE_TYPE = new TypeReference<Response<PageData<CategoryModel>>>() {
};
@Test @Test
public void addOne() throws Exception { public void addOne() throws Exception {
String categoryName = randomStr(4); String categoryName = randomStr(4);
System.out.println("categoryName: ==> " + categoryName); getMockData(post("/admin/category/create?name=" + categoryName), adminLogin()).andDo(result -> {
// 未登录 Response<CategoryModel> response = getResponse(result, CATEGORY_MODEL_TYPE);
mockMvc.perform(post("/admin/category/create?name=" + categoryName)).andExpect(status().isOk()) assertEquals(SUCCESS.getCode(), response.getCode());
.andDo(result -> { CategoryModel category = response.getResult();
assertEquals(HAVE_NOT_LOG_IN.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); assertEquals(categoryName, category.getName());
}); assertNotNull(category.getId());
// User权限 assertNotEquals(0, category.getArticles());
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());
});
} }
@Test @Test
public void deleteOne() throws Exception { public void deleteOne() throws Exception {
Category category = categoryMapper.getLastestCategory(); Category category = categoryMapper.getLastestCategory();
// 未登录 getMockData(delete("/admin/category/del?id=" + category.getId()), adminLogin()).andDo(result -> {
mockMvc.perform(delete("/admin/category/del?id=" + category.getId())).andExpect(status().isOk()) Response<Boolean> response = getResponse(result, BOOLEAN_TYPE);
.andDo(result -> { assertEquals(SUCCESS.getCode(), response.getCode());
assertEquals(HAVE_NOT_LOG_IN.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); assertTrue(response.getResult());
}); });
// 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));
});
} }
@Test @Test
public void updateOne() throws Exception { public void updateOne() throws Exception {
Category category = categoryMapper.getLastestCategory(); Category category = categoryMapper.getLastestCategory();
String name = randomStr(4); String name = randomStr(4);
// 未登录 getMockData(put("/admin/category/update?id=" + category.getId() + "&name=" + name), adminLogin()).andDo(result -> {
mockMvc.perform(put("/admin/category/update?id=" + category.getId() + "&name=" + name)).andExpect(status().isOk()) // Response<CategoryModel> response = mapper.readValue(result.getResponse().getContentAsString(), new ResponseType<Response<CategoryModel>>());
.andDo(result -> { Response<CategoryModel> response = getResponse(result, CATEGORY_MODEL_TYPE);
assertEquals(HAVE_NOT_LOG_IN.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
}); CategoryModel c = response.getResult();
// User权限 assertEquals(name, c.getName());
String token = userLogin(); assertNotEquals(0, c.getArticles());
mockMvc.perform(put("/admin/category/update?id=" + category.getId() + "&name=" + name) assertNotNull(c.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(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());
});
} }
@Test @Test
public void getPage() throws Exception { public void getPage() throws Exception {
mockMvc.perform(get("/categories")).andExpect(status().isOk()) getMockData(get("/categories")).andDo(result -> {
.andDo(result -> { Response<PageData<CategoryModel>> response = getResponse(result, CATEGORY_MODEL_PAGE_TYPE);
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); assertEquals(SUCCESS.getCode(), response.getCode());
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertNotNull(response.getResult());
JSONArray jsonArray = object.getJSONObject(Result).getJSONArray("list"); response.getResult().getList().forEach(c -> {
assertNotNull(jsonArray); assertNotNull(c.getName());
jsonArray.forEach(o -> { assertNotNull(c.getId());
CategoryModel c = (CategoryModel) JSONObject.toBean(JSONObject.fromObject(o), CategoryModel.class); assertNotEquals(0, c.getArticles());
assertNotNull(c.getName()); });
assertNotNull(c.getId()); });
assertNotEquals(0, c.getArticles());
});
});
} }
} }

98
src/test/java/cn/celess/blog/controller/CommentControllerTest.java
View File

@@ -3,21 +3,22 @@ package cn.celess.blog.controller;
import cn.celess.blog.BaseTest; import cn.celess.blog.BaseTest;
import cn.celess.blog.entity.Article; import cn.celess.blog.entity.Article;
import cn.celess.blog.entity.Comment; import cn.celess.blog.entity.Comment;
import cn.celess.blog.entity.Response;
import cn.celess.blog.entity.User; import cn.celess.blog.entity.User;
import cn.celess.blog.entity.model.CommentModel; import cn.celess.blog.entity.model.CommentModel;
import cn.celess.blog.entity.request.CommentReq; import cn.celess.blog.entity.request.CommentReq;
import cn.celess.blog.mapper.ArticleMapper; import cn.celess.blog.mapper.ArticleMapper;
import cn.celess.blog.mapper.CommentMapper; import cn.celess.blog.mapper.CommentMapper;
import cn.celess.blog.mapper.UserMapper; import cn.celess.blog.mapper.UserMapper;
import net.sf.json.JSONObject; import com.fasterxml.jackson.core.type.TypeReference;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; 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 org.junit.Assert.*;
import static cn.celess.blog.enmu.ResponseEnum.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
public class CommentControllerTest extends BaseTest { public class CommentControllerTest extends BaseTest {
@@ -27,46 +28,40 @@ public class CommentControllerTest extends BaseTest {
UserMapper userMapper; UserMapper userMapper;
@Autowired @Autowired
CommentMapper commentMapper; CommentMapper commentMapper;
private static final TypeReference<?> COMMENT_MODEL_TYPE = new TypeReference<Response<CommentModel>>() {
};
@Test @Test
public void addOne() throws Exception { public void addOne() throws Exception {
Article article = articleMapper.getLastestArticle(); Article article = articleMapper.getLastestArticle();
CommentReq commentReq = new CommentReq(); CommentReq commentReq = new CommentReq();
commentReq.setPagePath("/article/" + article.getId()); commentReq.setPagePath("/article/" + article.getId());
commentReq.setContent(UUID.randomUUID().toString()); commentReq.setContent(randomStr());
commentReq.setPid(-1L); List<User> all = userMapper.findAll();
commentReq.setToUserId(-1L); commentReq.setPid(1L);
String token = userLogin(); commentReq.setToUserId(2l);
mockMvc.perform(post("/user/comment/create") getMockData(post("/user/comment/create"), userLogin(), commentReq).andDo(result -> {
.contentType(MediaType.APPLICATION_JSON_UTF8) Response<CommentModel> response = getResponse(result, COMMENT_MODEL_TYPE);
.content(JSONObject.fromObject(commentReq).toString()) assertEquals(SUCCESS.getCode(), response.getCode());
.header("Authorization", token) CommentModel model = response.getResult();
).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);
assertNotEquals(0, model.getId()); assertNotEquals(0, model.getId());
assertEquals(commentReq.getPid(), model.getPid().longValue()); assertEquals(commentReq.getPid(), model.getPid().longValue());
assertEquals(-1, model.getPid().longValue()); assertEquals(1, model.getPid().longValue());
assertEquals(commentReq.getContent(), model.getContent()); assertEquals(commentReq.getContent(), model.getContent());
assertNotNull(model.getDate()); assertNotNull(model.getDate());
assertNotNull(model.getFromUser()); assertNotNull(model.getFromUser());
assertNull(model.getToUser()); assertNotNull(model.getToUser());
}); });
commentReq.setPagePath("/article/" + article.getId()); commentReq.setPagePath("/article/" + article.getId());
commentReq.setContent(UUID.randomUUID().toString()); commentReq.setContent(randomStr());
commentReq.setPid(-1L); commentReq.setPid(-1L);
commentReq.setToUserId(2); commentReq.setToUserId(2);
mockMvc.perform(post("/user/comment/create") getMockData(post("/user/comment/create"), userLogin(), commentReq).andDo(result -> {
.contentType(MediaType.APPLICATION_JSON_UTF8) Response<CommentModel> response = getResponse(result, COMMENT_MODEL_TYPE);
.content(JSONObject.fromObject(commentReq).toString()) assertEquals(SUCCESS.getCode(), response.getCode());
.header("Authorization", token) CommentModel model = response.getResult();
).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);
// 响应数据的完整性 // 响应数据的完整性
assertNotEquals(0, model.getId()); assertNotEquals(0, model.getId());
assertEquals(commentReq.getPid(), model.getPid().longValue()); 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.setPagePath("/article/" + article.getId());
commentReq.setContent(UUID.randomUUID().toString()); commentReq.setContent(randomStr());
commentReq.setPid(lastestComment.getId()); commentReq.setPid(latestComment.getId());
mockMvc.perform(post("/user/comment/create") getMockData(post("/user/comment/create"), userLogin(), commentReq).andDo(result -> {
.contentType(MediaType.APPLICATION_JSON_UTF8) Response<CommentModel> response = getResponse(result, COMMENT_MODEL_TYPE);
.content(JSONObject.fromObject(commentReq).toString()) assertEquals(SUCCESS.getCode(), response.getCode());
.header("Authorization", token) CommentModel model = response.getResult();
).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);
// 重新获取父评论信息 // 重新获取父评论信息
Comment pCommon = commentMapper.findCommentById(lastestComment.getId()); Comment pCommon = commentMapper.findCommentById(latestComment.getId());
assertEquals(pCommon.getId(), model.getPid()); assertEquals(pCommon.getId(), model.getPid());
}); });
} }
@@ -116,16 +107,13 @@ public class CommentControllerTest extends BaseTest {
// 接口测试 // 接口测试
long id = comment.getId(); long id = comment.getId();
assertNotEquals(0, id); assertNotEquals(0, id);
String token = userLogin(); getMockData(delete("/user/comment/del?id=" + id), userLogin()).andDo(result -> {
mockMvc.perform(delete("/user/comment/del?id=" + id).header("Authorization", token)).andDo(result -> { Response<Boolean> response = getResponse(result, BOOLEAN_TYPE);
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); assertEquals(SUCCESS.getCode(), response.getCode());
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertTrue(response.getResult());
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 -> assertEquals(DATA_IS_DELETED.getCode(), getResponse(result, COMMENT_MODEL_TYPE).getCode()));
} }
@Test @Test
@@ -133,16 +121,12 @@ public class CommentControllerTest extends BaseTest {
Comment comment = commentMapper.getLastestComment(); Comment comment = commentMapper.getLastestComment();
CommentReq commentReq = new CommentReq(); CommentReq commentReq = new CommentReq();
commentReq.setId(comment.getId()); commentReq.setId(comment.getId());
commentReq.setContent(UUID.randomUUID().toString()); commentReq.setContent(randomStr());
// 不合法数据 setResponseId // 不合法数据 setResponseId
mockMvc.perform(put("/user/comment/update") getMockData(put("/user/comment/update"), userLogin(), commentReq).andDo(result -> {
.content(JSONObject.fromObject(commentReq).toString()) Response<CommentModel> response = getResponse(result, COMMENT_MODEL_TYPE);
.contentType(MediaType.APPLICATION_JSON_UTF8) assertEquals(SUCCESS.getCode(), response.getCode());
.header("Authorization", userLogin()) CommentModel c = response.getResult();
).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);
assertEquals(commentReq.getContent(), c.getContent()); assertEquals(commentReq.getContent(), c.getContent());
}); });
} }

140
src/test/java/cn/celess/blog/controller/LinksControllerTest.java
View File

@@ -2,24 +2,19 @@ package cn.celess.blog.controller;
import cn.celess.blog.BaseTest; import cn.celess.blog.BaseTest;
import cn.celess.blog.entity.PartnerSite; import cn.celess.blog.entity.PartnerSite;
import cn.celess.blog.entity.Response;
import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.model.PageData;
import cn.celess.blog.entity.request.LinkApplyReq; import cn.celess.blog.entity.request.LinkApplyReq;
import cn.celess.blog.entity.request.LinkReq; import cn.celess.blog.entity.request.LinkReq;
import cn.celess.blog.exception.MyException; import cn.celess.blog.exception.MyException;
import cn.celess.blog.mapper.PartnerMapper; import cn.celess.blog.mapper.PartnerMapper;
import cn.celess.blog.service.MailService;
import cn.celess.blog.service.PartnerSiteService; import cn.celess.blog.service.PartnerSiteService;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.sf.json.JSONObject;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; 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.List;
import java.util.UUID;
import static cn.celess.blog.enmu.ResponseEnum.*; import static cn.celess.blog.enmu.ResponseEnum.*;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@@ -30,6 +25,12 @@ public class LinksControllerTest extends BaseTest {
@Autowired @Autowired
PartnerMapper mapper; PartnerMapper mapper;
private static final TypeReference<?> LINK_MODEL_TYPE = new TypeReference<Response<PartnerSite>>() {
};
private static final TypeReference<?> LINK_MODEL_LIST_TYPE = new TypeReference<Response<List<PartnerSite>>>() {
};
private static final TypeReference<?> LINK_MODEL_PAGE_TYPE = new TypeReference<Response<PageData<PartnerSite>>>() {
};
@Autowired @Autowired
PartnerSiteService partnerSiteService; PartnerSiteService partnerSiteService;
@@ -37,19 +38,13 @@ public class LinksControllerTest extends BaseTest {
@Test @Test
public void create() throws Exception { public void create() throws Exception {
LinkReq linkReq = new LinkReq(); LinkReq linkReq = new LinkReq();
linkReq.setName(UUID.randomUUID().toString().substring(0, 4)); linkReq.setName(randomStr(4));
linkReq.setOpen(false); linkReq.setOpen(false);
linkReq.setUrl("https://" + randomStr(4) + "celess.cn"); linkReq.setUrl("https://" + randomStr(4) + "example.com");
String token = adminLogin(); getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result -> {
mockMvc.perform( Response<PartnerSite> response = getResponse(result, LINK_MODEL_TYPE);
post("/admin/links/create") assertEquals(SUCCESS.getCode(), response.getCode());
.content(JSONObject.fromObject(linkReq).toString()) PartnerSite site = response.getResult();
.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()); assertNotNull(site.getId());
assertEquals(linkReq.getName(), site.getName()); assertEquals(linkReq.getName(), site.getName());
assertEquals(linkReq.getUrl(), site.getUrl()); assertEquals(linkReq.getUrl(), site.getUrl());
@@ -57,55 +52,45 @@ public class LinksControllerTest extends BaseTest {
}); });
// https/http // https/http
linkReq.setName(UUID.randomUUID().toString().substring(0, 4)); linkReq.setName(randomStr(4));
linkReq.setOpen(false); linkReq.setOpen(false);
String url = randomStr(4) + ".celess.cn"; linkReq.setUrl(randomStr(4) + ".example.com");
linkReq.setUrl(url); getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result -> {
mockMvc.perform( Response<PartnerSite> response = getResponse(result, LINK_MODEL_TYPE);
post("/admin/links/create") assertEquals(SUCCESS.getCode(), response.getCode());
.content(JSONObject.fromObject(linkReq).toString()) PartnerSite site = response.getResult();
.header("Authorization", token) assertEquals("http://" + linkReq.getUrl(), site.getUrl());
.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( getMockData(post("/admin/links/create"), adminLogin(), linkReq).andDo(result ->
post("/admin/links/create") assertEquals(DATA_HAS_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode())
.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 @Test
public void del() throws Exception { public void del() throws Exception {
PartnerSite partnerSite = new PartnerSite(); PartnerSite partnerSite = new PartnerSite();
partnerSite.setName(UUID.randomUUID().toString().substring(0, 4)); partnerSite.setName(randomStr(4));
partnerSite.setOpen(true); partnerSite.setOpen(true);
partnerSite.setDesc(""); partnerSite.setDesc("");
partnerSite.setIconPath(""); partnerSite.setIconPath("");
partnerSite.setUrl("https://" + randomStr(4) + ".celess.cn"); partnerSite.setUrl("https://" + randomStr(4) + ".celess.cn");
mapper.insert(partnerSite); mapper.insert(partnerSite);
PartnerSite lastest = mapper.getLastest(); PartnerSite latest = mapper.getLastest();
assertNotNull(lastest.getId()); assertNotNull(latest.getId());
String token = adminLogin(); getMockData(delete("/admin/links/del/" + latest.getId()), adminLogin()).andDo(result -> {
mockMvc.perform(delete("/admin/links/del/" + lastest.getId()).header("Authorization", token)).andDo(result -> { Response<Boolean> response = getResponse(result, BOOLEAN_TYPE);
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); assertEquals(SUCCESS.getCode(), response.getCode());
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertTrue(response.getResult());
assertTrue(object.getBoolean(Result));
}); });
long id = lastest.getId(); long id = latest.getId();
do { do {
id += 1; id += 1;
} while (mapper.existsById(id)); } while (mapper.existsById(id));
System.out.println("删除ID=" + id + "的数据"); System.out.println("删除ID=" + id + "的数据");
mockMvc.perform(delete("/admin/links/del/" + id).header("Authorization", token)).andDo(result -> getMockData(delete("/admin/links/del/" + id), adminLogin()).andDo(result ->
assertEquals(DATA_NOT_EXIST.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)) assertEquals(DATA_NOT_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode())
); );
} }
@@ -113,32 +98,27 @@ public class LinksControllerTest extends BaseTest {
public void update() throws Exception { public void update() throws Exception {
// 增数据 // 增数据
PartnerSite partnerSite = new PartnerSite(); PartnerSite partnerSite = new PartnerSite();
partnerSite.setName(UUID.randomUUID().toString().substring(0, 4)); partnerSite.setName(randomStr(4));
partnerSite.setOpen(true); partnerSite.setOpen(true);
partnerSite.setDesc(""); partnerSite.setDesc("");
partnerSite.setIconPath(""); partnerSite.setIconPath("");
partnerSite.setDelete(false); partnerSite.setDelete(false);
partnerSite.setUrl("https://" + randomStr(4) + ".celess.cn"); partnerSite.setUrl("https://" + randomStr(5) + ".celess.cn");
mapper.insert(partnerSite); mapper.insert(partnerSite);
// 查数据 // 查数据
PartnerSite lastest = mapper.getLastest(); PartnerSite latest = mapper.getLastest();
assertNotNull(lastest.getId()); assertNotNull(latest.getId());
String token = adminLogin();
// 构建请求 // 构建请求
LinkReq linkReq = new LinkReq(); LinkReq linkReq = new LinkReq();
linkReq.setUrl(lastest.getUrl()); linkReq.setUrl(latest.getUrl());
linkReq.setOpen(!lastest.getOpen()); linkReq.setOpen(!latest.getOpen());
linkReq.setName(UUID.randomUUID().toString().substring(0, 4)); linkReq.setName(randomStr(4));
linkReq.setId(lastest.getId()); linkReq.setId(latest.getId());
mockMvc.perform(
put("/admin/links/update") getMockData(put("/admin/links/update"), adminLogin(), linkReq).andDo(result -> {
.content(JSONObject.fromObject(linkReq).toString()) Response<PartnerSite> response = getResponse(result, LINK_MODEL_TYPE);
.contentType(MediaType.APPLICATION_JSON) assertEquals(SUCCESS.getCode(), response.getCode());
.header("Authorization", token) PartnerSite site = response.getResult();
).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()); assertNotNull(site.getId());
assertEquals(linkReq.getId(), site.getId().longValue()); assertEquals(linkReq.getId(), site.getId().longValue());
assertEquals(linkReq.getUrl(), site.getUrl()); assertEquals(linkReq.getUrl(), site.getUrl());
@@ -149,11 +129,10 @@ public class LinksControllerTest extends BaseTest {
@Test @Test
public void allForOpen() throws Exception { public void allForOpen() throws Exception {
mockMvc.perform(get("/links")).andDo(result -> { getMockData(get("/links")).andDo(result -> {
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<List<PartnerSite>> response = getResponse(result, LINK_MODEL_LIST_TYPE);
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
object.getJSONArray(Result).forEach(o -> { response.getResult().forEach(site -> {
PartnerSite site = (PartnerSite) JSONObject.toBean(JSONObject.fromObject(o), PartnerSite.class);
assertNotNull(site.getUrl()); assertNotNull(site.getUrl());
assertNull(site.getOpen()); assertNull(site.getOpen());
assertNotNull(site.getName()); assertNotNull(site.getName());
@@ -163,14 +142,13 @@ public class LinksControllerTest extends BaseTest {
@Test @Test
public void all() throws Exception { public void all() throws Exception {
mockMvc.perform(get("/admin/links?page=1&count=10").header("Authorization", adminLogin())).andDo(result -> { getMockData(get("/admin/links?page=1&count=10"), adminLogin()).andDo(result -> {
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<PageData<PartnerSite>> response = getResponse(result, LINK_MODEL_PAGE_TYPE);
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
PageData<PartnerSite> pageData = (PageData<PartnerSite>) JSONObject.toBean(object.getJSONObject(Result), PageData.class); PageData<PartnerSite> pageData = response.getResult();
assertEquals(1, pageData.getPageNum()); assertEquals(1, pageData.getPageNum());
assertEquals(10, pageData.getPageSize()); assertEquals(10, pageData.getPageSize());
for (Object o : pageData.getList()) { for (PartnerSite site : pageData.getList()) {
PartnerSite site = (PartnerSite) JSONObject.toBean(JSONObject.fromObject(o), PartnerSite.class);
assertNotNull(site.getUrl()); assertNotNull(site.getUrl());
assertNotNull(site.getName()); assertNotNull(site.getName());
assertNotNull(site.getOpen()); assertNotNull(site.getOpen());
@@ -178,7 +156,6 @@ public class LinksControllerTest extends BaseTest {
}); });
} }
// 手动测试
@Test @Test
public void apply() { public void apply() {
// 做service 层的测试 // 做service 层的测试
@@ -240,7 +217,7 @@ public class LinksControllerTest extends BaseTest {
req.setEmail(randomStr(4) + "@celess.cn"); req.setEmail(randomStr(4) + "@celess.cn");
req.setLinkUrl("https://bing.com"); req.setLinkUrl("https://bing.com");
req.setUrl(req.getLinkUrl()); req.setUrl(req.getLinkUrl());
String uuid = null; String uuid;
try { try {
partnerSiteService.apply(req); partnerSiteService.apply(req);
// err here // err here
@@ -257,6 +234,5 @@ public class LinksControllerTest extends BaseTest {
} catch (MyException e) { } catch (MyException e) {
assertEquals(DATA_EXPIRED.getCode(), e.getCode()); assertEquals(DATA_EXPIRED.getCode(), e.getCode());
} }
} }
} }

109
src/test/java/cn/celess/blog/controller/TagControllerTest.java
View File

@@ -1,36 +1,42 @@
package cn.celess.blog.controller; package cn.celess.blog.controller;
import cn.celess.blog.BaseTest; import cn.celess.blog.BaseTest;
import cn.celess.blog.entity.Response;
import cn.celess.blog.entity.Tag; import cn.celess.blog.entity.Tag;
import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.model.PageData;
import cn.celess.blog.entity.model.TagModel; import cn.celess.blog.entity.model.TagModel;
import cn.celess.blog.mapper.TagMapper; import cn.celess.blog.mapper.TagMapper;
import net.sf.json.JSONArray; import com.fasterxml.jackson.core.type.TypeReference;
import net.sf.json.JSONObject;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; 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.junit.Assert.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; 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 { public class TagControllerTest extends BaseTest {
@Autowired @Autowired
TagMapper tagMapper; TagMapper tagMapper;
private static final TypeReference<?> TAG_MODEL_TYPE = new TypeReference<Response<TagModel>>() {
};
private static final TypeReference<?> TAG_MODEL_PAGE_TYPE = new TypeReference<Response<PageData<TagModel>>>() {
};
private static final TypeReference<?> TAG_NAC_LIST_TYPE = new TypeReference<Response<List<Map<String, Object>>>>() {
};
@Test @Test
public void addOne() throws Exception { public void addOne() throws Exception {
String name = randomStr(4); 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))); getMockData(post("/admin/tag/create?name=" + name)).andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), getResponse(result, STRING_TYPE).getCode()));
mockMvc.perform(post("/admin/tag/create?name=" + name).header("authorization", userLogin())).andDo(result -> assertEquals(PERMISSION_ERROR.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); getMockData(post("/admin/tag/create?name=" + name), userLogin()).andDo(result -> assertEquals(PERMISSION_ERROR.getCode(), getResponse(result, STRING_TYPE).getCode()));
mockMvc.perform(post("/admin/tag/create?name=" + name).header("authorization", adminLogin())).andDo(result -> { getMockData(post("/admin/tag/create?name=" + name), adminLogin()).andDo(result -> {
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<TagModel> response = getResponse(result, TAG_MODEL_TYPE);
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
JSONObject resJson = object.getJSONObject(Result); TagModel tag = response.getResult();
TagModel tag = (TagModel) JSONObject.toBean(resJson, TagModel.class);
assertNotNull(tag.getId()); assertNotNull(tag.getId());
assertEquals(name, tag.getName()); assertEquals(name, tag.getName());
}); });
@@ -42,16 +48,14 @@ public class TagControllerTest extends BaseTest {
public void delOne() throws Exception { public void delOne() throws Exception {
Tag lastestTag = tagMapper.getLastestTag(); Tag lastestTag = tagMapper.getLastestTag();
assertNotNull(lastestTag.getId()); assertNotNull(lastestTag.getId());
String token = adminLogin(); getMockData(delete("/admin/tag/del?id=" + lastestTag.getId()), adminLogin()).andDo(result -> {
mockMvc.perform(delete("/admin/tag/del?id=" + lastestTag.getId()).header("Authorization", token)).andDo(result -> { Response<Boolean> response = getResponse(result, BOOLEAN_TYPE);
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); assertEquals(SUCCESS.getCode(), response.getCode());
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertTrue(response.getResult());
assertTrue(object.getBoolean(Result));
}); });
long id = lastestTag.getId() * 2; long id = lastestTag.getId() * 2;
mockMvc.perform(delete("/admin/tag/del?id=" + id).header("Authorization", token)).andDo(result -> getMockData(delete("/admin/tag/del?id=" + id), adminLogin())
assertEquals(TAG_NOT_EXIST.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)) .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 { public void updateOne() throws Exception {
Tag tag = tagMapper.getLastestTag(); Tag tag = tagMapper.getLastestTag();
assertNotNull(tag.getId()); assertNotNull(tag.getId());
String name = UUID.randomUUID().toString().substring(0, 4); String name = randomStr(4);
mockMvc.perform(put("/admin/tag/update?id=" + tag.getId() + "&name=" + name).header("Authorization", adminLogin())).andDo(result -> { getMockData(put("/admin/tag/update?id=" + tag.getId() + "&name=" + name), adminLogin()).andDo(result -> {
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<TagModel> response = getResponse(result, TAG_MODEL_TYPE);
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
assertNotNull(object.getJSONObject(Result)); assertNotNull(response.getResult());
TagModel t = (TagModel) JSONObject.toBean(object.getJSONObject(Result), TagModel.class); TagModel t = response.getResult();
assertEquals(name, t.getName()); assertEquals(name, t.getName());
assertEquals(tag.getId(), t.getId()); assertEquals(tag.getId(), t.getId());
}); });
@@ -73,40 +77,33 @@ public class TagControllerTest extends BaseTest {
@Test @Test
public void getPage() throws Exception { public void getPage() throws Exception {
mockMvc.perform(get("/tags?page=1&count=5")) getMockData(get("/tags?page=1&count=5")).andDo(result -> {
.andExpect(status().is(200)) Response<PageData<TagModel>> response = getResponse(result, TAG_MODEL_PAGE_TYPE);
.andDo(result -> { assertEquals(SUCCESS.getCode(), response.getCode());
JSONObject articlesJSON = JSONObject.fromObject(result.getResponse().getContentAsString()); // 结果集非空
// 断言获取数据成功 assertNotNull(response.getResult());
assertEquals(SUCCESS.getCode(), articlesJSON.getInt(Code)); // 判断pageInfo是否包装完全
// 结果集非空 PageData<TagModel> pageData = response.getResult();
assertNotNull(articlesJSON.getJSONObject(Result)); assertNotEquals(0, pageData.getTotal());
// 判断pageInfo是否包装完全 assertEquals(1, pageData.getPageNum());
JSONObject resultJson = JSONObject.fromObject(articlesJSON.getJSONObject(Result)); assertEquals(5, pageData.getPageSize());
PageData<TagModel> pageData = (PageData<TagModel>) JSONObject.toBean(resultJson, PageData.class); // 内容完整
assertNotEquals(0, pageData.getTotal()); for (TagModel t : pageData.getList()) {
assertEquals(1, pageData.getPageNum()); assertNotNull(t.getId());
assertEquals(5, pageData.getPageSize()); assertNotNull(t.getName());
// 内容完整 }
for (Object tag : pageData.getList()) { });
TagModel t = (TagModel) JSONObject.toBean(JSONObject.fromObject(tag), TagModel.class);
assertNotNull(t.getId());
assertNotNull(t.getName());
}
});
} }
@Test @Test
public void getTagNameAndCount() throws Exception { public void getTagNameAndCount() throws Exception {
mockMvc.perform(get("/tags/nac")).andDo(result -> { getMockData(get("/tags/nac")).andDo(result -> {
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<List<Map<String, Object>>> response = getResponse(result, TAG_NAC_LIST_TYPE);
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
JSONArray jsonArray = object.getJSONArray(Result); assertNotNull(response.getResult());
assertNotNull(jsonArray); response.getResult().forEach(o -> {
jsonArray.forEach(o -> { assertNotNull(o.get("name"));
JSONObject json = JSONObject.fromObject(o); assertNotNull(o.get("size"));
assertTrue(json.containsKey("size"));
assertTrue(json.containsKey("name"));
}); });
}); });
} }

275
src/test/java/cn/celess/blog/controller/UserControllerTest.java
View File

@@ -1,6 +1,7 @@
package cn.celess.blog.controller; package cn.celess.blog.controller;
import cn.celess.blog.BaseTest; import cn.celess.blog.BaseTest;
import cn.celess.blog.entity.Response;
import cn.celess.blog.entity.User; import cn.celess.blog.entity.User;
import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.model.PageData;
import cn.celess.blog.entity.model.UserModel; import cn.celess.blog.entity.model.UserModel;
@@ -9,31 +10,48 @@ import cn.celess.blog.entity.request.UserReq;
import cn.celess.blog.mapper.UserMapper; import cn.celess.blog.mapper.UserMapper;
import cn.celess.blog.service.UserService; import cn.celess.blog.service.UserService;
import cn.celess.blog.util.MD5Util; import cn.celess.blog.util.MD5Util;
import net.sf.json.JSONArray; import cn.celess.blog.util.RedisUtil;
import net.sf.json.JSONObject; import com.fasterxml.jackson.core.type.TypeReference;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.mock.web.MockMultipartFile; import org.springframework.mock.web.MockMultipartFile;
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import java.io.InputStream; import java.io.InputStream;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.util.*; 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.junit.Assert.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static cn.celess.blog.enmu.ResponseEnum.*;
public class UserControllerTest extends BaseTest { public class UserControllerTest extends BaseTest {
@Autowired @Autowired
UserMapper userMapper; UserMapper userMapper;
@Autowired @Autowired
RedisUtil redisUtil;
private static final TypeReference<?> USER_MODEL_TYPE = new TypeReference<Response<UserModel>>() {
};
private static final TypeReference<?> USER_MODEL_PAGE_TYPE = new TypeReference<Response<PageData<UserModel>>>() {
};
private static final TypeReference<?> USER_MODEL_LIST_TYPE = new TypeReference<Response<List<Map<String, Object>>>>() {
};
@Autowired
UserService userService; UserService userService;
@Test @Test
public void login() throws Exception { public void login() throws Exception {
assertNotNull(userLogin()); assertNotNull(userLogin());
@@ -43,11 +61,7 @@ public class UserControllerTest extends BaseTest {
req.setEmail("zh@celess.cn"); req.setEmail("zh@celess.cn");
req.setPassword("123456789"); req.setPassword("123456789");
req.setIsRememberMe(false); req.setIsRememberMe(false);
JSONObject loginReq = JSONObject.fromObject(req); getMockData(post("/login"), null, req).andDo(result -> assertEquals(USER_NOT_EXIST.getCode(), getResponse(result, STRING_TYPE).getCode()));
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 @Test
@@ -57,41 +71,39 @@ public class UserControllerTest extends BaseTest {
@Test @Test
public void logout() throws Exception { public void logout() throws Exception {
mockMvc.perform(get("/logout")).andDo(result -> assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); getMockData(get("/logout")).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result, STRING_TYPE).getCode()));
mockMvc.perform(get("/logout").header("Authorization", userLogin())).andDo(result -> assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); getMockData(get("/logout"), adminLogin()).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result).getCode()));
} }
@Test @Test
public void updateInfo() throws Exception { public void updateInfo() throws Exception {
String desc = UUID.randomUUID().toString().substring(0, 4); String desc = randomStr(4);
String disPlayName = UUID.randomUUID().toString().substring(0, 4); String disPlayName = randomStr(4);
mockMvc.perform(put("/user/userInfo/update?desc=" + desc + "&displayName=" + disPlayName).header("Authorization", userLogin())) getMockData(put("/user/userInfo/update?desc=" + desc + "&displayName=" + disPlayName), userLogin()).andDo(result -> {
.andDo(result -> { Response<UserModel> response = getResponse(result, USER_MODEL_TYPE);
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); assertEquals(SUCCESS.getCode(), response.getCode());
assertEquals(SUCCESS.getCode(), object.getInt(Code)); UserModel u = response.getResult();
UserModel u = (UserModel) JSONObject.toBean(object.getJSONObject(Result), UserModel.class); assertEquals(desc, u.getDesc());
assertEquals(desc, u.getDesc()); assertEquals(disPlayName, u.getDisplayName());
assertEquals(disPlayName, u.getDisplayName()); assertNotNull(u.getId());
assertNotNull(u.getId()); });
});
} }
@Test @Test
public void getUserInfo() throws Exception { public void getUserInfo() throws Exception {
mockMvc.perform(get("/user/userInfo").header("Authorization", userLogin())) getMockData(get("/user/userInfo"), adminLogin()).andDo(result -> {
.andDo(result -> { Response<UserModel> response = getResponse(result, USER_MODEL_TYPE);
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); assertEquals(SUCCESS.getCode(), response.getCode());
assertEquals(SUCCESS.getCode(), object.getInt(Code)); UserModel u = response.getResult();
UserModel u = (UserModel) JSONObject.toBean(object.getJSONObject(Result), UserModel.class); assertNotNull(u.getId());
assertNotNull(u.getId()); assertNotNull(u.getEmail());
assertNotNull(u.getEmail()); assertNotNull(u.getDisplayName());
assertNotNull(u.getDisplayName()); assertNotNull(u.getEmailStatus());
assertNotNull(u.getEmailStatus()); assertNotNull(u.getAvatarImgUrl());
assertNotNull(u.getAvatarImgUrl()); assertNotNull(u.getDesc());
assertNotNull(u.getDesc()); assertNotNull(u.getRecentlyLandedDate());
assertNotNull(u.getRecentlyLandedDate()); assertNotNull(u.getRole());
assertNotNull(u.getRole()); });
});
} }
@Test @Test
@@ -106,11 +118,10 @@ public class UserControllerTest extends BaseTest {
mockInjectInstance(userService, "qiniuService", new TestQiNiuServiceImpl()); mockInjectInstance(userService, "qiniuService", new TestQiNiuServiceImpl());
MockMultipartFile file = new MockMultipartFile("file", "logo.png", MediaType.IMAGE_PNG_VALUE, inputStream); 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))); getMockData(multipart("/user/imgUpload").file(file), userLogin()).andDo(result -> {
mockMvc.perform(multipart("/user/imgUpload").file(file).header("Authorization", userLogin())).andDo(result -> { Response<Object> response = getResponse(result, OBJECT_TYPE);
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); assertEquals(SUCCESS.getCode(), response.getCode());
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertNotNull(response.getResult());
assertNotNull(object.getString(Result));
}); });
} }
@@ -125,20 +136,41 @@ public class UserControllerTest extends BaseTest {
} }
@Test @Test
public void emailVerify() { public void emailVerify() throws Exception {
// ignore 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 @Test
public void resetPwd() { public void resetPwd() throws Exception {
// ignore 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 @Test
public void multipleDelete() throws Exception { public void multipleDelete() throws Exception {
List<User> userList = new ArrayList<>(); List<User> userList = new ArrayList<>();
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
String s = UUID.randomUUID().toString(); String s = randomStr();
String email = s.substring(s.length() - 4) + "@celess.cn"; String email = s.substring(s.length() - 4) + "@celess.cn";
String pwd = MD5Util.getMD5("123456789"); String pwd = MD5Util.getMD5("123456789");
User user = new User(email, pwd); User user = new User(email, pwd);
@@ -152,130 +184,93 @@ public class UserControllerTest extends BaseTest {
userMapper.setUserRole(userMapper.findByEmail(email).getId(), "admin"); userMapper.setUserRole(userMapper.findByEmail(email).getId(), "admin");
} }
} }
List<Long> idList = new ArrayList<>(); List<Integer> idList = userList.stream().map(user -> user.getId().intValue()).collect(Collectors.toList());
userList.forEach(user -> idList.add(user.getId())); getMockData(delete("/admin/user/delete"), adminLogin(), idList).andDo(result -> {
System.out.println("id :: == > " + idList.toString()); Response<List<Map<String, Object>>> response = getResponse(result, USER_MODEL_LIST_TYPE);
mockMvc.perform(delete("/admin/user/delete").content(idList.toString()).contentType("application/json")) assertEquals(SUCCESS.getCode(), response.getCode());
.andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); response.getResult().forEach(o -> {
mockMvc.perform(delete("/admin/user/delete").content(idList.toString()).contentType("application/json").header("Authorization", userLogin())) // 判断响应数据中是否包含输入的id
.andDo(result -> assertEquals(PERMISSION_ERROR.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); assertTrue(idList.contains((int) o.get("id")));
mockMvc.perform(delete("/admin/user/delete").content(idList.toString()).contentType("application/json").header("Authorization", adminLogin())) // 判断处理状态
.andDo(result -> { boolean status = (boolean) o.get("status");
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); if (o.containsKey("msg"))
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertFalse(status);
JSONArray jsonArray = object.getJSONArray(Result); else
jsonArray.forEach(o -> { assertTrue(status);
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 @Test
public void updateInfoByAdmin() throws Exception { public void updateInfoByAdmin() throws Exception {
UserReq userReq = new UserReq(); UserReq userReq = new UserReq();
String email = UUID.randomUUID().toString().substring(0, 4) + "@celess.cn"; String email = randomStr(4) + "@celess.cn";
User user = new User(email, MD5Util.getMD5("123456789")); User user = new User(email, MD5Util.getMD5("123456789"));
userMapper.addUser(user); userMapper.addUser(user);
User userByDb = userMapper.findByEmail(email); User userByDb = userMapper.findByEmail(email);
userReq.setId(userByDb.getId()); userReq.setId(userByDb.getId());
userReq.setPwd(UUID.randomUUID().toString().replaceAll("-", "").substring(0, 10)); userReq.setPwd(randomStr().substring(0, 10));
userReq.setDesc(UUID.randomUUID().toString()); userReq.setDesc(randomStr());
userReq.setEmailStatus(new Random().nextBoolean()); userReq.setEmailStatus(new Random().nextBoolean());
userReq.setRole("admin"); userReq.setRole("admin");
userReq.setDisplayName(UUID.randomUUID().toString().substring(0, 4)); userReq.setDisplayName(randomStr(4));
userReq.setEmail(UUID.randomUUID().toString().substring(0, 5) + "@celess.cn"); userReq.setEmail(randomStr(5) + "@celess.cn");
mockMvc.perform(put("/admin/user").contentType("application/json").content(JSONObject.fromObject(userReq).toString())) getMockData(put("/admin/user"), adminLogin(), userReq).andDo(result -> {
.andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); Response<UserModel> response = getResponse(result, USER_MODEL_TYPE);
mockMvc.perform(put("/admin/user").contentType("application/json").header("Authorization", userLogin()).content(JSONObject.fromObject(userReq).toString())) assertEquals(SUCCESS.getCode(), response.getCode());
.andDo(result -> assertEquals(PERMISSION_ERROR.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); UserModel userModel = response.getResult();
mockMvc.perform(put("/admin/user").contentType("application/json").header("Authorization", adminLogin()).content(JSONObject.fromObject(userReq).toString())) assertEquals(userReq.getId(), userModel.getId());
.andDo(result -> { assertEquals(userReq.getRole(), userModel.getRole());
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); assertEquals(userReq.getEmail(), userModel.getEmail());
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertEquals(userReq.getDesc(), userModel.getDesc());
UserModel userModel = (UserModel) JSONObject.toBean(object.getJSONObject(Result), UserModel.class); assertEquals(userReq.getDisplayName(), userModel.getDisplayName());
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 @Test
public void getAllUser() throws Exception { public void getAllUser() throws Exception {
mockMvc.perform(get("/admin/users?page=1&count=10")) getMockData(get("/admin/users?page=1&count=10"), adminLogin()).andDo(result -> {
.andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))); Response<PageData<UserModel>> response = getResponse(result, USER_MODEL_PAGE_TYPE);
mockMvc.perform(get("/admin/users?page=1&count=10").header("authorization", userLogin())) assertEquals(SUCCESS.getCode(), response.getCode());
.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())) assertNotNull(response.getResult());
.andDo(result -> { // 判断pageInfo是否包装完全
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); PageData<UserModel> pageData = response.getResult();
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertNotEquals(0, pageData.getTotal());
// 结果集非空 assertEquals(1, pageData.getPageNum());
assertNotNull(object.getJSONObject(Result)); assertEquals(10, pageData.getPageSize());
// 判断pageInfo是否包装完全 // 内容完整
JSONObject resultJson = JSONObject.fromObject(object.getJSONObject(Result)); for (UserModel u : pageData.getList()) {
PageData<UserModel> pageData = (PageData<UserModel>) JSONObject.toBean(resultJson, PageData.class); assertNotNull(u.getId());
assertNotEquals(0, pageData.getTotal()); assertNotNull(u.getEmail());
assertEquals(1, pageData.getPageNum()); assertNotNull(u.getRole());
assertEquals(10, pageData.getPageSize()); assertNotNull(u.getEmailStatus());
// 内容完整 assertNotNull(u.getDisplayName());
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 @Test
public void getEmailStatus() throws Exception { public void getEmailStatus() throws Exception {
String email = UUID.randomUUID().toString().substring(0, 4) + "@celess.cn"; String email = randomStr(4) + "@celess.cn";
mockMvc.perform(get("/emailStatus/" + email)).andDo(result -> { getMockData(get("/emailStatus/" + email)).andDo(result -> assertFalse((Boolean) getResponse(result, BOOLEAN_TYPE).getResult()));
String content = result.getResponse().getContentAsString(); getMockData(get("/emailStatus/" + ADMIN_EMAIL)).andDo(result -> assertTrue((Boolean) getResponse(result, BOOLEAN_TYPE).getResult()));
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 @Test
public void setPwd() throws Exception { public void setPwd() throws Exception {
String email = UUID.randomUUID().toString().substring(0, 4) + "@celess.cn"; String email = randomStr(4) + "@celess.cn";
assertEquals(1, userMapper.addUser(new User(email, MD5Util.getMD5("1234567890")))); assertEquals(1, userMapper.addUser(new User(email, MD5Util.getMD5("1234567890"))));
LoginReq req = new LoginReq(); LoginReq req = new LoginReq(email, "1234567890", false);
req.setEmail(email); String token = login(req);
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); assertNotNull(token);
MultiValueMap<String, String> param = new LinkedMultiValueMap<String, String>(); MultiValueMap<String, String> param = new LinkedMultiValueMap<String, String>();
param.add("pwd", "1234567890"); param.add("pwd", "1234567890");
param.add("newPwd", "aaabbbccc"); param.add("newPwd", "aaabbbccc");
param.add("confirmPwd", "aaabbbccc"); param.add("confirmPwd", "aaabbbccc");
mockMvc.perform(post("/user/setPwd").header("Authorization", token).params(param)).andDo(result -> { getMockData(post("/user/setPwd").params(param), token).andDo(result -> {
String content = result.getResponse().getContentAsString(); assertEquals(SUCCESS.getCode(), getResponse(result).getCode());
assertEquals(SUCCESS.getCode(), JSONObject.fromObject(content).getInt(Code));
assertEquals(MD5Util.getMD5("aaabbbccc"), userMapper.getPwd(email)); assertEquals(MD5Util.getMD5("aaabbbccc"), userMapper.getPwd(email));
}); });
} }

75
src/test/java/cn/celess/blog/controller/VisitorControllerTest.java
View File

@@ -1,25 +1,29 @@
package cn.celess.blog.controller; package cn.celess.blog.controller;
import cn.celess.blog.BaseTest; import cn.celess.blog.BaseTest;
import cn.celess.blog.entity.Response;
import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.model.PageData;
import cn.celess.blog.entity.model.VisitorModel; import cn.celess.blog.entity.model.VisitorModel;
import com.github.pagehelper.PageInfo; import com.fasterxml.jackson.core.type.TypeReference;
import net.sf.json.JSONObject;
import org.junit.Test; 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.junit.Assert.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static cn.celess.blog.enmu.ResponseEnum.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
public class VisitorControllerTest extends BaseTest { public class VisitorControllerTest extends BaseTest {
private final TypeReference<?> VISITOR_PAGE_TYPE = new TypeReference<Response<PageData<VisitorModel>>>() {
};
private final TypeReference<?> VISITOR_TYPE = new TypeReference<Response<VisitorModel>>() {
};
@Test @Test
public void getVisitorCount() throws Exception { public void getVisitorCount() throws Exception {
mockMvc.perform(get("/visitor/count")).andDo(result -> { getMockData(get("/visitor/count")).andDo(result -> {
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<Object> response = getResponse(result);
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
assertTrue(object.containsKey(Result)); assertNotNull(response.getResult());
}); });
} }
@@ -27,29 +31,26 @@ public class VisitorControllerTest extends BaseTest {
public void page() throws Exception { public void page() throws Exception {
int count = 10; int count = 10;
int page = 1; int page = 1;
mockMvc.perform(get("/admin/visitor/page?count=" + count + "&page=" + page).header("Authorization", adminLogin())) getMockData(get("/admin/visitor/page?count=" + count + "&page=" + page), adminLogin()).andDo(result -> {
.andDo(result -> { Response<PageData<VisitorModel>> response = getResponse(result, VISITOR_PAGE_TYPE);
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); assertEquals(SUCCESS.getCode(), response.getCode());
assertEquals(SUCCESS.getCode(), object.getInt(Code)); PageData<VisitorModel> pageData = response.getResult();
JSONObject resultJson = JSONObject.fromObject(object.getJSONObject(Result)); assertNotEquals(0, pageData.getTotal());
PageData<VisitorModel> pageData = (PageData<VisitorModel>) JSONObject.toBean(resultJson, PageData.class); assertEquals(1, pageData.getPageNum());
assertNotEquals(0, pageData.getTotal()); assertEquals(10, pageData.getPageSize());
assertEquals(1, pageData.getPageNum()); for (VisitorModel v : pageData.getList()) {
assertEquals(10, pageData.getPageSize()); assertNotEquals(0, v.getId());
for (Object ver : pageData.getList()) { assertNotNull(v.getDate());
VisitorModel v = (VisitorModel) JSONObject.toBean(JSONObject.fromObject(ver), VisitorModel.class); }
assertNotEquals(0, v.getId()); });
assertNotNull(v.getDate());
}
});
} }
@Test @Test
public void add() throws Exception { public void add() throws Exception {
mockMvc.perform(post("/visit")).andDo(MockMvcResultHandlers.print()).andDo(result -> { getMockData(post("/visit")).andDo(result -> {
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<VisitorModel> response = getResponse(result, VISITOR_TYPE);
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
VisitorModel visitorModel = (VisitorModel) JSONObject.toBean(object.getJSONObject(Result), VisitorModel.class); VisitorModel visitorModel = response.getResult();
assertNotEquals(0, visitorModel.getId()); assertNotEquals(0, visitorModel.getId());
assertNotNull(visitorModel.getIp()); assertNotNull(visitorModel.getIp());
}); });
@@ -57,26 +58,26 @@ public class VisitorControllerTest extends BaseTest {
@Test @Test
public void dayVisitCount() throws Exception { public void dayVisitCount() throws Exception {
mockMvc.perform(get("/dayVisitCount")).andDo(MockMvcResultHandlers.print()).andDo(result -> getMockData(get("/dayVisitCount")).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result).getCode()));
assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))
);
} }
// 手动测试 // 手动测试
// @Test // @Test
public void ipLocation() throws Exception { public void ipLocation() throws Exception {
String ip = "127.0.0.1"; String ip = "127.0.0.1";
mockMvc.perform(get("/ip/" + ip)).andDo(MockMvcResultHandlers.print()).andDo(result -> { getMockData(get("/ip/" + ip)).andDo(result -> {
assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); Response<Object> response = getResponse(result);
assertTrue(JSONObject.fromObject(result.getResponse().getContentAsString()).containsKey(Result)); assertEquals(SUCCESS.getCode(), response.getCode());
assertNotNull(response.getResult());
}); });
} }
@Test @Test
public void getIp() throws Exception { public void getIp() throws Exception {
mockMvc.perform(get("/ip")).andDo(MockMvcResultHandlers.print()).andDo(result -> { getMockData(get("/ip")).andDo(result -> {
assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); Response<String> response = getResponse(result, STRING_TYPE);
assertEquals("127.0.0.1", JSONObject.fromObject(result.getResponse().getContentAsString()).getString(Result)); assertEquals(SUCCESS.getCode(), response.getCode());
assertEquals("127.0.0.1", response.getResult());
}); });
} }
} }

80
src/test/java/cn/celess/blog/controller/WebUpdateInfoControllerTest.java
View File

@@ -1,35 +1,46 @@
package cn.celess.blog.controller; package cn.celess.blog.controller;
import cn.celess.blog.BaseTest; import cn.celess.blog.BaseTest;
import cn.celess.blog.entity.Response;
import cn.celess.blog.entity.WebUpdate; import cn.celess.blog.entity.WebUpdate;
import cn.celess.blog.entity.model.PageData; import cn.celess.blog.entity.model.PageData;
import cn.celess.blog.entity.model.WebUpdateModel; import cn.celess.blog.entity.model.WebUpdateModel;
import cn.celess.blog.mapper.WebUpdateInfoMapper; import cn.celess.blog.mapper.WebUpdateInfoMapper;
import net.sf.json.JSONArray; import com.fasterxml.jackson.core.type.TypeReference;
import net.sf.json.JSONObject; import lombok.extern.slf4j.Slf4j;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date; import java.util.Date;
import java.util.List; 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.junit.Assert.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
@Slf4j
public class WebUpdateInfoControllerTest extends BaseTest { public class WebUpdateInfoControllerTest extends BaseTest {
private final TypeReference<?> MODAL_TYPE = new TypeReference<Response<WebUpdateModel>>() {
};
private final TypeReference<?> MODAL_LIST_TYPE = new TypeReference<Response<List<WebUpdateModel>>>() {
};
private final TypeReference<?> MODAL_PAGE_TYPE = new TypeReference<Response<PageData<WebUpdateModel>>>() {
};
@Autowired @Autowired
WebUpdateInfoMapper mapper; WebUpdateInfoMapper mapper;
@Test @Test
public void create() throws Exception { public void create() throws Exception {
String info = UUID.randomUUID().toString(); String info = randomStr();
mockMvc.perform(post("/admin/webUpdate/create?info=" + info).header("Authorization", adminLogin())).andDo(result -> { getMockData(post("/admin/webUpdate/create?info=" + info), adminLogin()).andDo(result -> {
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<WebUpdateModel> response = getResponse(result, MODAL_TYPE);
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
assertTrue(object.containsKey(Result)); assertNotNull(response.getResult());
WebUpdateModel webUpdateModel = (WebUpdateModel) JSONObject.toBean(object.getJSONObject(Result), WebUpdateModel.class); WebUpdateModel webUpdateModel = response.getResult();
assertEquals(info, webUpdateModel.getInfo()); assertEquals(info, webUpdateModel.getInfo());
assertNotNull(webUpdateModel.getTime()); assertNotNull(webUpdateModel.getTime());
assertNotEquals(0, webUpdateModel.getId()); assertNotEquals(0, webUpdateModel.getId());
@@ -40,7 +51,7 @@ public class WebUpdateInfoControllerTest extends BaseTest {
public void del() throws Exception { public void del() throws Exception {
// 新增数据 // 新增数据
WebUpdate webUpdate = new WebUpdate(); WebUpdate webUpdate = new WebUpdate();
webUpdate.setUpdateInfo(UUID.randomUUID().toString()); webUpdate.setUpdateInfo(randomStr());
webUpdate.setUpdateTime(new Date()); webUpdate.setUpdateTime(new Date());
mapper.insert(webUpdate); mapper.insert(webUpdate);
// 接口测试 // 接口测试
@@ -49,32 +60,31 @@ public class WebUpdateInfoControllerTest extends BaseTest {
assertNotEquals(0, update.getId()); assertNotEquals(0, update.getId());
long id = update.getId(); long id = update.getId();
mockMvc.perform(delete("/admin/webUpdate/del/" + id).header("Authorization", adminLogin())).andDo(result -> { getMockData(delete("/admin/webUpdate/del/" + id), adminLogin()).andDo(result -> {
assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)); Response<Object> response = getResponse(result);
assertTrue(JSONObject.fromObject(result.getResponse().getContentAsString()).getBoolean(Result)); assertEquals(SUCCESS.getCode(), response.getCode());
assertNotNull(response.getResult());
}); });
do { do {
id += 2; id += 2;
} while (mapper.existsById(id)); } while (mapper.existsById(id));
System.out.println("准备删除ID=" + id + "的不存在记录"); log.debug("准备删除ID={}的不存在记录", id);
mockMvc.perform(delete("/admin/webUpdate/del/" + id).header("Authorization", adminLogin())).andDo(result -> getMockData(delete("/admin/webUpdate/del/" + id), adminLogin()).andDo(result -> assertEquals(DATA_NOT_EXIST.getCode(), getResponse(result).getCode()));
assertEquals(DATA_NOT_EXIST.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code))
);
} }
@Test @Test
public void update() throws Exception { public void update() throws Exception {
// 新增数据 // 新增数据
WebUpdate webUpdate = new WebUpdate(); WebUpdate webUpdate = new WebUpdate();
webUpdate.setUpdateInfo(UUID.randomUUID().toString()); webUpdate.setUpdateInfo(randomStr());
webUpdate.setUpdateTime(new Date()); webUpdate.setUpdateTime(new Date());
mapper.insert(webUpdate); mapper.insert(webUpdate);
List<WebUpdate> all = mapper.findAll(); List<WebUpdate> all = mapper.findAll();
WebUpdate update = all.get(all.size() - 1); WebUpdate update = all.get(all.size() - 1);
assertNotEquals(0, update.getId()); assertNotEquals(0, update.getId());
assertNotNull(update.getUpdateInfo()); assertNotNull(update.getUpdateInfo());
String info = UUID.randomUUID().toString(); String info = randomStr();
mockMvc.perform(put("/admin/webUpdate/update?id=" + update.getId() + "&info=" + info).header("Authorization", adminLogin())).andDo(result -> { getMockData(put("/admin/webUpdate/update?id=" + update.getId() + "&info=" + info), adminLogin()).andDo(result -> {
List<WebUpdate> list = mapper.findAll(); List<WebUpdate> list = mapper.findAll();
WebUpdate up = list.get(list.size() - 1); WebUpdate up = list.get(list.size() - 1);
assertEquals(update.getId(), up.getId()); assertEquals(update.getId(), up.getId());
@@ -85,12 +95,12 @@ public class WebUpdateInfoControllerTest extends BaseTest {
@Test @Test
public void findAll() throws Exception { public void findAll() throws Exception {
mockMvc.perform(get("/webUpdate")).andDo(result -> { getMockData(get("/webUpdate")).andDo(result -> {
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<List<WebUpdateModel>> response = getResponse(result, MODAL_LIST_TYPE);
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
JSONArray jsonArray = object.getJSONArray(Result); assertNotNull(response.getResult());
jsonArray.forEach(o -> { assertNotEquals(0, response.getResult());
WebUpdateModel webUpdate = (WebUpdateModel) JSONObject.toBean(JSONObject.fromObject(o), WebUpdateModel.class); response.getResult().forEach(webUpdate -> {
assertNotEquals(0, webUpdate.getId()); assertNotEquals(0, webUpdate.getId());
assertNotNull(webUpdate.getTime()); assertNotNull(webUpdate.getTime());
assertNotNull(webUpdate.getInfo()); assertNotNull(webUpdate.getInfo());
@@ -100,15 +110,14 @@ public class WebUpdateInfoControllerTest extends BaseTest {
@Test @Test
public void page() throws Exception { public void page() throws Exception {
mockMvc.perform(get("/webUpdate/pages?page=1&count=10")).andDo(result -> { getMockData(get("/webUpdate/pages?page=1&count=10")).andDo(result -> {
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<PageData<WebUpdateModel>> response = getResponse(result, MODAL_PAGE_TYPE);
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
assertNotNull(object.getJSONObject(Result)); assertNotNull(response.getResult());
PageData<WebUpdateModel> pageData = (PageData<WebUpdateModel>) JSONObject.toBean(object.getJSONObject(Result), PageData.class); PageData<WebUpdateModel> pageData = response.getResult();
assertEquals(1, pageData.getPageNum()); assertEquals(1, pageData.getPageNum());
assertEquals(10, pageData.getPageSize()); assertEquals(10, pageData.getPageSize());
for (Object o : pageData.getList()) { for (WebUpdateModel model : pageData.getList()) {
WebUpdateModel model = (WebUpdateModel) JSONObject.toBean(JSONObject.fromObject(o), WebUpdateModel.class);
assertNotEquals(0, model.getId()); assertNotEquals(0, model.getId());
assertNotNull(model.getTime()); assertNotNull(model.getTime());
assertNotNull(model.getInfo()); assertNotNull(model.getInfo());
@@ -118,7 +127,6 @@ public class WebUpdateInfoControllerTest extends BaseTest {
@Test @Test
public void lastestUpdateTime() throws Exception { public void lastestUpdateTime() throws Exception {
mockMvc.perform(get("/lastestUpdate")).andDo(result -> getMockData(get("/lastestUpdate")).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result).getCode()));
assertEquals(SUCCESS.getCode(), JSONObject.fromObject(result.getResponse().getContentAsString()).getInt(Code)));
} }
} }

59
src/test/java/cn/celess/blog/filter/AuthorizationFilter.java
View File

@@ -1,12 +1,12 @@
package cn.celess.blog.filter; package cn.celess.blog.filter;
import cn.celess.blog.BaseTest; import cn.celess.blog.BaseTest;
import net.sf.json.JSONObject; import cn.celess.blog.entity.Response;
import org.junit.Test; 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 cn.celess.blog.enmu.ResponseEnum.*;
import static org.junit.Assert.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
/** /**
* @Author: 小海 * @Author: 小海
@@ -17,60 +17,37 @@ public class AuthorizationFilter extends BaseTest {
@Test @Test
public void UserAccess() throws Exception { public void UserAccess() throws Exception {
String token = "";
// 未登录 // 未登录
mockMvc.perform(get("/user/userInfo").header("Authorization", token)).andDo(result -> { getMockData(get("/user/userInfo")).andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), getResponse(result).getCode()));
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); // user权限登录
assertEquals(HAVE_NOT_LOG_IN.getCode(), object.getInt(Code)); getMockData(get("/user/userInfo"), userLogin()).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result).getCode()));
});
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));
});
} }
@Test @Test
public void AdminAccess() throws Exception { public void AdminAccess() throws Exception {
String token = "";
// 未登录 // 未登录
mockMvc.perform(get("/admin/articles?page=1&count=1").header("Authorization", token)).andDo(result -> { getMockData(get("/admin/articles?page=1&count=1")).andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), getResponse(result).getCode()));
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); // user权限
assertEquals(HAVE_NOT_LOG_IN.getCode(), object.getInt(Code)); getMockData(get("/admin/articles?page=1&count=1"), userLogin()).andDo(result -> assertEquals(PERMISSION_ERROR.getCode(), getResponse(result).getCode()));
}); // admin 权限
token = userLogin(); getMockData(get("/admin/articles?page=1&count=1"), adminLogin()).andDo(result -> assertEquals(SUCCESS.getCode(), getResponse(result).getCode()));
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));
});
} }
@Test @Test
public void VisitorAccess() throws Exception { public void VisitorAccess() throws Exception {
mockMvc.perform(get("/user/userInfo")).andDo(result -> { getMockData(get("/user/userInfo")).andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), getResponse(result).getCode()));
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); getMockData(get("/admin/articles?page=1&count=1")).andDo(result -> assertEquals(HAVE_NOT_LOG_IN.getCode(), getResponse(result).getCode()));
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));
});
} }
@Test @Test
public void authorizationTest() throws Exception { public void authorizationTest() throws Exception {
// 测试response中有无Authorization字段 // 测试response中有无Authorization字段
String s = userLogin(); String token = userLogin();
mockMvc.perform(get("/user/userInfo").header("Authorization", s)).andDo(result -> { getMockData(get("/user/userInfo"), token).andDo(result -> {
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<Object> response = getResponse(result);
assertEquals(SUCCESS.getCode(), object.getInt(Code)); assertEquals(SUCCESS.getCode(), response.getCode());
assertNotNull(result.getResponse().getHeader("Authorization")); assertNotNull(result.getResponse().getHeader("Authorization"));
assertNotEquals(s, result.getResponse().getHeader("Authorization")); assertNotEquals(token, result.getResponse().getHeader("Authorization"));
}); });
} }
} }

15
src/test/java/cn/celess/blog/filter/MultipleSubmitFilter.java
View File

@@ -2,16 +2,11 @@ package cn.celess.blog.filter;
import cn.celess.blog.BaseTest; import cn.celess.blog.BaseTest;
import cn.celess.blog.enmu.ResponseEnum; import cn.celess.blog.enmu.ResponseEnum;
import net.sf.json.JSONObject; import cn.celess.blog.entity.Response;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockHttpSession; 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.request.MockMvcRequestBuilders;
import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
import javax.servlet.http.Cookie;
/** /**
* @Author: 小海 * @Author: 小海
@@ -31,11 +26,11 @@ public class MultipleSubmitFilter extends BaseTest {
private void sendRequest(ResponseEnum expectResponse, String... msg) throws Exception { private void sendRequest(ResponseEnum expectResponse, String... msg) throws Exception {
mockMvc.perform(MockMvcRequestBuilders.get("/counts").session(session)).andDo(result -> { getMockData(MockMvcRequestBuilders.get("/counts").session(session)).andDo(result -> {
JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString()); Response<Object> response = getResponse(result);
Assert.assertEquals(expectResponse.getCode(), object.getInt(Code)); Assert.assertEquals(expectResponse.getCode(), response.getCode());
if (msg.length != 0) { if (msg.length != 0) {
Assert.assertEquals(msg[0], object.getString("msg")); Assert.assertEquals(msg[0], response.getMsg());
} }
}); });
} }

7
src/test/java/cn/celess/blog/mapper/ArticleMapperTest.java
View File

@@ -6,7 +6,6 @@ import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import java.util.List; import java.util.List;
import java.util.UUID;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@@ -37,7 +36,7 @@ public class ArticleMapperTest extends BaseTest {
@Test @Test
public void update() { public void update() {
Article article = generateArticle().getArticle(); Article article = generateArticle().getArticle();
String randomText = UUID.randomUUID().toString(); String randomText = randomStr();
// 此字段不会通过insert被写入数据库而是使用插入数据的默认值 数据库中该字段默认为true // 此字段不会通过insert被写入数据库而是使用插入数据的默认值 数据库中该字段默认为true
article.setOpen(true); article.setOpen(true);
@@ -117,7 +116,7 @@ public class ArticleMapperTest extends BaseTest {
public void existsByTitle() { public void existsByTitle() {
Article article = generateArticle().getArticle(); Article article = generateArticle().getArticle();
assertTrue(articleMapper.existsByTitle(article.getTitle())); assertTrue(articleMapper.existsByTitle(article.getTitle()));
assertFalse(articleMapper.existsByTitle(UUID.randomUUID().toString())); assertFalse(articleMapper.existsByTitle(randomStr()));
} }
@Test @Test
@@ -196,7 +195,7 @@ public class ArticleMapperTest extends BaseTest {
} }
private ArticleTag generateArticle() { private ArticleTag generateArticle() {
String randomText = UUID.randomUUID().toString(); String randomText = randomStr();
Article article = new Article(); Article article = new Article();
Category category = new Category(); Category category = new Category();

4
src/test/java/cn/celess/blog/mapper/ArticleTagMapperTest.java
View File

@@ -5,9 +5,7 @@ import cn.celess.blog.entity.*;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.UUID;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@@ -111,7 +109,7 @@ public class ArticleTagMapperTest extends BaseTest {
} }
private ArticleTag generateArticle() { private ArticleTag generateArticle() {
String randomText = UUID.randomUUID().toString(); String randomText = randomStr();
Article article = new Article(); Article article = new Article();
Category category = new Category(); Category category = new Category();

1
src/test/java/cn/celess/blog/mapper/CategoryMapperTest.java
View File

@@ -5,7 +5,6 @@ import cn.celess.blog.entity.Category;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;

3
src/test/java/cn/celess/blog/mapper/VisitorMapperTest.java
View File

@@ -7,7 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date; 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 { public class VisitorMapperTest extends BaseTest {

2
src/test/java/cn/celess/blog/util/DateFormatUtilTest.java
View File

@@ -5,7 +5,7 @@ import org.junit.Test;
import java.util.Date; import java.util.Date;
import static org.junit.Assert.*; import static org.junit.Assert.assertNotNull;
public class DateFormatUtilTest extends BaseTest { public class DateFormatUtilTest extends BaseTest {

6
src/test/java/cn/celess/blog/util/HttpUtilTest.java
View File

@@ -1,13 +1,9 @@
package cn.celess.blog.util; package cn.celess.blog.util;
import cn.celess.blog.BaseTest; import cn.celess.blog.BaseTest;
import cn.celess.blog.enmu.ResponseEnum;
import cn.celess.blog.entity.Response;
import org.junit.Test; import org.junit.Test;
import java.util.Map; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.*;
public class HttpUtilTest extends BaseTest { public class HttpUtilTest extends BaseTest {

2
src/test/java/cn/celess/blog/util/MD5UtilTest.java
View File

@@ -3,7 +3,7 @@ package cn.celess.blog.util;
import cn.celess.blog.BaseTest; import cn.celess.blog.BaseTest;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.*; import static org.junit.Assert.assertEquals;
public class MD5UtilTest extends BaseTest { public class MD5UtilTest extends BaseTest {