Commit 3aaedd1d authored by Liang Ding's avatar Liang Ding

升级框架

parent 16714569
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</scm> </scm>
<properties> <properties>
<org.b3log.latke.version>3.0.12</org.b3log.latke.version> <org.b3log.latke.version>3.0.13</org.b3log.latke.version>
<slf4j.version>1.7.28</slf4j.version> <slf4j.version>1.7.28</slf4j.version>
<jsoup.version>1.12.1</jsoup.version> <jsoup.version>1.12.1</jsoup.version>
......
...@@ -325,7 +325,7 @@ public class AdminConsole { ...@@ -325,7 +325,7 @@ public class AdminConsole {
response.setContentType("application/zip"); response.setContentType("application/zip");
final String fileName = "solo-sql-" + date + ".zip"; final String fileName = "solo-sql-" + date + ".zip";
response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\""); response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
response.sendContent(zipData); response.sendBytes(zipData);
// 导出 SQL 包后清理临时文件 https://github.com/b3log/solo/issues/12770 // 导出 SQL 包后清理临时文件 https://github.com/b3log/solo/issues/12770
localFile.delete(); localFile.delete();
...@@ -376,7 +376,7 @@ public class AdminConsole { ...@@ -376,7 +376,7 @@ public class AdminConsole {
response.setContentType("application/zip"); response.setContentType("application/zip");
final String fileName = "solo-json-" + date + ".zip"; final String fileName = "solo-json-" + date + ".zip";
response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\""); response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
response.sendContent(zipData); response.sendBytes(zipData);
} }
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.ERROR, "Export failed", e); LOGGER.log(Level.ERROR, "Export failed", e);
...@@ -443,7 +443,7 @@ public class AdminConsole { ...@@ -443,7 +443,7 @@ public class AdminConsole {
response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\""); response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
} }
response.sendContent(zipData); response.sendBytes(zipData);
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.log(Level.ERROR, "Export failed", e); LOGGER.log(Level.ERROR, "Export failed", e);
context.renderJSON().renderMsg("Export failed, please check log"); context.renderJSON().renderMsg("Export failed, please check log");
......
...@@ -59,7 +59,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase { ...@@ -59,7 +59,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "{\"sc\":true")); Assert.assertTrue(StringUtils.contains(content, "{\"sc\":true"));
} }
...@@ -79,7 +79,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase { ...@@ -79,7 +79,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "Solo 博客系统已经初始化完毕")); Assert.assertTrue(StringUtils.contains(content, "Solo 博客系统已经初始化完毕"));
} }
...@@ -94,7 +94,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase { ...@@ -94,7 +94,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "{\"sc\":true")); Assert.assertTrue(StringUtils.contains(content, "{\"sc\":true"));
} }
...@@ -114,7 +114,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase { ...@@ -114,7 +114,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "{\"sc\":true")); Assert.assertTrue(StringUtils.contains(content, "{\"sc\":true"));
} }
...@@ -129,7 +129,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase { ...@@ -129,7 +129,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "{\"randomArticles")); Assert.assertTrue(StringUtils.contains(content, "{\"randomArticles"));
} }
...@@ -148,7 +148,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase { ...@@ -148,7 +148,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "{\"relevantArticles\"")); Assert.assertTrue(StringUtils.contains(content, "{\"relevantArticles\""));
} }
...@@ -163,7 +163,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase { ...@@ -163,7 +163,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "{\"sc\":true")); Assert.assertTrue(StringUtils.contains(content, "{\"sc\":true"));
} }
...@@ -179,7 +179,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase { ...@@ -179,7 +179,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "Solo 的个人博客</title>")); Assert.assertTrue(StringUtils.contains(content, "Solo 的个人博客</title>"));
} }
...@@ -199,7 +199,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase { ...@@ -199,7 +199,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "Solo 的个人博客</title>")); Assert.assertTrue(StringUtils.contains(content, "Solo 的个人博客</title>"));
} }
...@@ -220,7 +220,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase { ...@@ -220,7 +220,7 @@ public class ArticleProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "<title>访问密码 - Solo 的个人博客</title>")); Assert.assertTrue(StringUtils.contains(content, "<title>访问密码 - Solo 的个人博客</title>"));
} }
} }
...@@ -52,7 +52,7 @@ public class BlogProcessorTestCase extends AbstractTestCase { ...@@ -52,7 +52,7 @@ public class BlogProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.startsWith(content, "{\"staticServePath\":\"http://localhost:8080\"")); Assert.assertTrue(StringUtils.startsWith(content, "{\"staticServePath\":\"http://localhost:8080\""));
} }
...@@ -67,7 +67,7 @@ public class BlogProcessorTestCase extends AbstractTestCase { ...@@ -67,7 +67,7 @@ public class BlogProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.startsWith(content, "{\"data\":")); Assert.assertTrue(StringUtils.startsWith(content, "{\"data\":"));
} }
} }
...@@ -73,7 +73,7 @@ public class CategoryProcessorTestCase extends AbstractTestCase { ...@@ -73,7 +73,7 @@ public class CategoryProcessorTestCase extends AbstractTestCase {
response = mockResponse(); response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "<title>分类1 - Solo 的个人博客</title>")); Assert.assertTrue(StringUtils.contains(content, "<title>分类1 - Solo 的个人博客</title>"));
} }
} }
...@@ -77,7 +77,7 @@ public class CommentProcessorTestCase extends AbstractTestCase { ...@@ -77,7 +77,7 @@ public class CommentProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "\"sc\":true")); Assert.assertTrue(StringUtils.contains(content, "\"sc\":true"));
} }
......
...@@ -52,7 +52,7 @@ public class ErrorProcessorTestCase extends AbstractTestCase { ...@@ -52,7 +52,7 @@ public class ErrorProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "<title>403 Forbidden! - Solo 的个人博客</title>")); Assert.assertTrue(StringUtils.contains(content, "<title>403 Forbidden! - Solo 的个人博客</title>"));
} }
} }
...@@ -52,7 +52,7 @@ public class FeedProcessorTestCase extends AbstractTestCase { ...@@ -52,7 +52,7 @@ public class FeedProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.startsWith(content, "<?xml version=\"1.0\"")); Assert.assertTrue(StringUtils.startsWith(content, "<?xml version=\"1.0\""));
} }
...@@ -66,7 +66,7 @@ public class FeedProcessorTestCase extends AbstractTestCase { ...@@ -66,7 +66,7 @@ public class FeedProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.startsWith(content, "<?xml version=\"1.0\"")); Assert.assertTrue(StringUtils.startsWith(content, "<?xml version=\"1.0\""));
} }
} }
...@@ -48,7 +48,7 @@ public class IndexProcessorTestCase extends AbstractTestCase { ...@@ -48,7 +48,7 @@ public class IndexProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "<title>欢迎使用! - Solo</title>")); Assert.assertTrue(StringUtils.contains(content, "<title>欢迎使用! - Solo</title>"));
} }
...@@ -70,7 +70,7 @@ public class IndexProcessorTestCase extends AbstractTestCase { ...@@ -70,7 +70,7 @@ public class IndexProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "<title>Solo 的个人博客</title>")); Assert.assertTrue(StringUtils.contains(content, "<title>Solo 的个人博客</title>"));
} }
...@@ -84,7 +84,7 @@ public class IndexProcessorTestCase extends AbstractTestCase { ...@@ -84,7 +84,7 @@ public class IndexProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "<title>Kill IE! - Solo 的个人博客</title>")); Assert.assertTrue(StringUtils.contains(content, "<title>Kill IE! - Solo 的个人博客</title>"));
} }
......
...@@ -52,7 +52,7 @@ public class SearchProcessorTestCase extends AbstractTestCase { ...@@ -52,7 +52,7 @@ public class SearchProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>")); Assert.assertTrue(StringUtils.contains(content, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"));
} }
...@@ -68,7 +68,7 @@ public class SearchProcessorTestCase extends AbstractTestCase { ...@@ -68,7 +68,7 @@ public class SearchProcessorTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "Solo 的个人博客搜索")); Assert.assertTrue(StringUtils.contains(content, "Solo 的个人博客搜索"));
} }
} }
...@@ -52,7 +52,7 @@ public class SitemapProcessorTestCase extends AbstractTestCase { ...@@ -52,7 +52,7 @@ public class SitemapProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.startsWith(content, "<?xml version=\"1.0\"")); Assert.assertTrue(StringUtils.startsWith(content, "<?xml version=\"1.0\""));
} }
} }
...@@ -55,7 +55,7 @@ public class TagProcessorTestCase extends AbstractTestCase { ...@@ -55,7 +55,7 @@ public class TagProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "<title>Solo 标签 - Solo 的个人博客</title>")); Assert.assertTrue(StringUtils.contains(content, "<title>Solo 标签 - Solo 的个人博客</title>"));
} }
} }
...@@ -55,7 +55,7 @@ public class UserTemplateProcessorTestCase extends AbstractTestCase { ...@@ -55,7 +55,7 @@ public class UserTemplateProcessorTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "<title>友情链接 - Solo 的个人博客</title>")); Assert.assertTrue(StringUtils.contains(content, "<title>友情链接 - Solo 的个人博客</title>"));
} }
} }
...@@ -54,17 +54,15 @@ public class AdminConsoleTestCase extends AbstractTestCase { ...@@ -54,17 +54,15 @@ public class AdminConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "后台管理 - Solo 的个人博客")); Assert.assertTrue(StringUtils.contains(content, "后台管理 - Solo 的个人博客"));
} }
/** /**
* showAdminFunctions. * showAdminFunctions.
*
* @throws Exception exception
*/ */
@Test(dependsOnMethods = "init") @Test(dependsOnMethods = "init")
public void showAdminFunctions() throws Exception { public void showAdminFunctions() {
final MockRequest request = mockRequest(); final MockRequest request = mockRequest();
request.setRequestURI("/admin-article.do"); request.setRequestURI("/admin-article.do");
mockAdminLogin(request); mockAdminLogin(request);
...@@ -72,17 +70,15 @@ public class AdminConsoleTestCase extends AbstractTestCase { ...@@ -72,17 +70,15 @@ public class AdminConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "<div class=\"form\">")); Assert.assertTrue(StringUtils.contains(content, "<div class=\"form\">"));
} }
/** /**
* showAdminPreferenceFunction. * showAdminPreferenceFunction.
*
* @throws Exception exception
*/ */
@Test(dependsOnMethods = "init") @Test(dependsOnMethods = "init")
public void showAdminPreferenceFunction() throws Exception { public void showAdminPreferenceFunction() {
final MockRequest request = mockRequest(); final MockRequest request = mockRequest();
request.setRequestURI("/admin-preference.do"); request.setRequestURI("/admin-preference.do");
mockAdminLogin(request); mockAdminLogin(request);
...@@ -90,17 +86,15 @@ public class AdminConsoleTestCase extends AbstractTestCase { ...@@ -90,17 +86,15 @@ public class AdminConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "信息配置")); Assert.assertTrue(StringUtils.contains(content, "信息配置"));
} }
/** /**
* exportSQL. * exportSQL.
*
* @throws Exception exception
*/ */
@Test(dependsOnMethods = "init") @Test(dependsOnMethods = "init")
public void exportSQL() throws Exception { public void exportSQL() {
final MockRequest request = mockRequest(); final MockRequest request = mockRequest();
request.setRequestURI("/console/export/sql"); request.setRequestURI("/console/export/sql");
mockAdminLogin(request); mockAdminLogin(request);
...@@ -108,17 +102,15 @@ public class AdminConsoleTestCase extends AbstractTestCase { ...@@ -108,17 +102,15 @@ public class AdminConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final long outputBytes = response.getContent().length; final long outputBytes = response.getBytes().length;
Assert.assertTrue(0 < outputBytes); Assert.assertTrue(0 < outputBytes);
} }
/** /**
* exportJSON. * exportJSON.
*
* @throws Exception exception
*/ */
@Test(dependsOnMethods = "init") @Test(dependsOnMethods = "init")
public void exportJSON() throws Exception { public void exportJSON() {
final MockRequest request = mockRequest(); final MockRequest request = mockRequest();
request.setRequestURI("/console/export/json"); request.setRequestURI("/console/export/json");
mockAdminLogin(request); mockAdminLogin(request);
...@@ -126,17 +118,15 @@ public class AdminConsoleTestCase extends AbstractTestCase { ...@@ -126,17 +118,15 @@ public class AdminConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final long outputBytes = response.getContent().length; final long outputBytes = response.getBytes().length;
Assert.assertTrue(0 < outputBytes); Assert.assertTrue(0 < outputBytes);
} }
/** /**
* exportHexo. * exportHexo.
*
* @throws Exception exception
*/ */
@Test(dependsOnMethods = "init") @Test(dependsOnMethods = "init")
public void exportHexo() throws Exception { public void exportHexo() {
final MockRequest request = mockRequest(); final MockRequest request = mockRequest();
request.setRequestURI("/console/export/hexo"); request.setRequestURI("/console/export/hexo");
mockAdminLogin(request); mockAdminLogin(request);
...@@ -144,7 +134,7 @@ public class AdminConsoleTestCase extends AbstractTestCase { ...@@ -144,7 +134,7 @@ public class AdminConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final long outputBytes = response.getContent().length; final long outputBytes = response.getBytes().length;
Assert.assertTrue(0 < outputBytes); Assert.assertTrue(0 < outputBytes);
} }
} }
...@@ -60,7 +60,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase { ...@@ -60,7 +60,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "\"sc\":true")); Assert.assertTrue(StringUtils.contains(content, "\"sc\":true"));
} }
...@@ -83,7 +83,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase { ...@@ -83,7 +83,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "<p><strong>Solo<\\/strong><\\/p>")); Assert.assertTrue(StringUtils.contains(content, "<p><strong>Solo<\\/strong><\\/p>"));
} }
...@@ -104,7 +104,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase { ...@@ -104,7 +104,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "\"sc\":true")); Assert.assertTrue(StringUtils.contains(content, "\"sc\":true"));
} }
...@@ -122,7 +122,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase { ...@@ -122,7 +122,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "\"sc\":true")); Assert.assertTrue(StringUtils.contains(content, "\"sc\":true"));
} }
...@@ -144,7 +144,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase { ...@@ -144,7 +144,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "\"sc\":true")); Assert.assertTrue(StringUtils.contains(content, "\"sc\":true"));
} }
...@@ -166,7 +166,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase { ...@@ -166,7 +166,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "\"sc\":true")); Assert.assertTrue(StringUtils.contains(content, "\"sc\":true"));
} }
...@@ -188,7 +188,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase { ...@@ -188,7 +188,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "\"sc\":true")); Assert.assertTrue(StringUtils.contains(content, "\"sc\":true"));
} }
...@@ -210,7 +210,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase { ...@@ -210,7 +210,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "\"sc\":true")); Assert.assertTrue(StringUtils.contains(content, "\"sc\":true"));
} }
...@@ -235,7 +235,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase { ...@@ -235,7 +235,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "\"sc\":true")); Assert.assertTrue(StringUtils.contains(content, "\"sc\":true"));
} }
...@@ -262,7 +262,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase { ...@@ -262,7 +262,7 @@ public class ArticleConsoleTestCase extends AbstractTestCase {
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "\"sc\":true")); Assert.assertTrue(StringUtils.contains(content, "\"sc\":true"));
} }
} }
...@@ -66,7 +66,7 @@ public class CategoryConsoleTestCase extends AbstractTestCase { ...@@ -66,7 +66,7 @@ public class CategoryConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -88,7 +88,7 @@ public class CategoryConsoleTestCase extends AbstractTestCase { ...@@ -88,7 +88,7 @@ public class CategoryConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -114,7 +114,7 @@ public class CategoryConsoleTestCase extends AbstractTestCase { ...@@ -114,7 +114,7 @@ public class CategoryConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
category = getCategoryQueryService().getByTitle("分类1"); category = getCategoryQueryService().getByTitle("分类1");
...@@ -141,7 +141,7 @@ public class CategoryConsoleTestCase extends AbstractTestCase { ...@@ -141,7 +141,7 @@ public class CategoryConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -167,7 +167,7 @@ public class CategoryConsoleTestCase extends AbstractTestCase { ...@@ -167,7 +167,7 @@ public class CategoryConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -189,7 +189,7 @@ public class CategoryConsoleTestCase extends AbstractTestCase { ...@@ -189,7 +189,7 @@ public class CategoryConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
} }
...@@ -61,7 +61,7 @@ public class CommentConsoleTestCase extends AbstractTestCase { ...@@ -61,7 +61,7 @@ public class CommentConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -84,7 +84,7 @@ public class CommentConsoleTestCase extends AbstractTestCase { ...@@ -84,7 +84,7 @@ public class CommentConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -108,7 +108,7 @@ public class CommentConsoleTestCase extends AbstractTestCase { ...@@ -108,7 +108,7 @@ public class CommentConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
} }
...@@ -71,7 +71,7 @@ public class LinkConsoleTestCase extends AbstractTestCase { ...@@ -71,7 +71,7 @@ public class LinkConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -103,7 +103,7 @@ public class LinkConsoleTestCase extends AbstractTestCase { ...@@ -103,7 +103,7 @@ public class LinkConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -130,7 +130,7 @@ public class LinkConsoleTestCase extends AbstractTestCase { ...@@ -130,7 +130,7 @@ public class LinkConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -152,7 +152,7 @@ public class LinkConsoleTestCase extends AbstractTestCase { ...@@ -152,7 +152,7 @@ public class LinkConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -171,7 +171,7 @@ public class LinkConsoleTestCase extends AbstractTestCase { ...@@ -171,7 +171,7 @@ public class LinkConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -194,7 +194,7 @@ public class LinkConsoleTestCase extends AbstractTestCase { ...@@ -194,7 +194,7 @@ public class LinkConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
} }
...@@ -58,7 +58,7 @@ public class OtherConsoleTestCase extends AbstractTestCase { ...@@ -58,7 +58,7 @@ public class OtherConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
} }
...@@ -71,7 +71,7 @@ public class PageConsoleTestCase extends AbstractTestCase { ...@@ -71,7 +71,7 @@ public class PageConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -96,7 +96,7 @@ public class PageConsoleTestCase extends AbstractTestCase { ...@@ -96,7 +96,7 @@ public class PageConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -123,7 +123,7 @@ public class PageConsoleTestCase extends AbstractTestCase { ...@@ -123,7 +123,7 @@ public class PageConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -145,7 +145,7 @@ public class PageConsoleTestCase extends AbstractTestCase { ...@@ -145,7 +145,7 @@ public class PageConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -164,7 +164,7 @@ public class PageConsoleTestCase extends AbstractTestCase { ...@@ -164,7 +164,7 @@ public class PageConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -187,7 +187,7 @@ public class PageConsoleTestCase extends AbstractTestCase { ...@@ -187,7 +187,7 @@ public class PageConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
} }
...@@ -57,7 +57,7 @@ public class PluginConsoleTestCase extends AbstractTestCase { ...@@ -57,7 +57,7 @@ public class PluginConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
} }
...@@ -57,7 +57,7 @@ public class PreferenceConsoleTestCase extends AbstractTestCase { ...@@ -57,7 +57,7 @@ public class PreferenceConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -76,7 +76,7 @@ public class PreferenceConsoleTestCase extends AbstractTestCase { ...@@ -76,7 +76,7 @@ public class PreferenceConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -99,7 +99,7 @@ public class PreferenceConsoleTestCase extends AbstractTestCase { ...@@ -99,7 +99,7 @@ public class PreferenceConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
} }
...@@ -57,7 +57,7 @@ public class RepairConsoleTestCase extends AbstractTestCase { ...@@ -57,7 +57,7 @@ public class RepairConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "Restore signs succeeded.")); Assert.assertTrue(StringUtils.contains(content, "Restore signs succeeded."));
} }
} }
...@@ -57,7 +57,7 @@ public class TagConsoleTestCase extends AbstractTestCase { ...@@ -57,7 +57,7 @@ public class TagConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -76,17 +76,15 @@ public class TagConsoleTestCase extends AbstractTestCase { ...@@ -76,17 +76,15 @@ public class TagConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
/** /**
* removeUnusedTags. * removeUnusedTags.
*
* @throws Exception exception
*/ */
@Test(dependsOnMethods = "getUnusedTags") @Test(dependsOnMethods = "getUnusedTags")
public void removeUnusedTags() throws Exception { public void removeUnusedTags() {
final MockRequest request = mockRequest(); final MockRequest request = mockRequest();
request.setRequestURI("/console/tag/unused"); request.setRequestURI("/console/tag/unused");
request.setMethod("DELETE"); request.setMethod("DELETE");
...@@ -96,7 +94,7 @@ public class TagConsoleTestCase extends AbstractTestCase { ...@@ -96,7 +94,7 @@ public class TagConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
} }
...@@ -64,7 +64,7 @@ public class UserConsoleTestCase extends AbstractTestCase { ...@@ -64,7 +64,7 @@ public class UserConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -86,7 +86,7 @@ public class UserConsoleTestCase extends AbstractTestCase { ...@@ -86,7 +86,7 @@ public class UserConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -105,7 +105,7 @@ public class UserConsoleTestCase extends AbstractTestCase { ...@@ -105,7 +105,7 @@ public class UserConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -127,7 +127,7 @@ public class UserConsoleTestCase extends AbstractTestCase { ...@@ -127,7 +127,7 @@ public class UserConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
...@@ -150,7 +150,7 @@ public class UserConsoleTestCase extends AbstractTestCase { ...@@ -150,7 +150,7 @@ public class UserConsoleTestCase extends AbstractTestCase {
final MockResponse response = mockResponse(); final MockResponse response = mockResponse();
mockDispatcher(request, response); mockDispatcher(request, response);
final String content = response.getContentStr(); final String content = response.getString();
Assert.assertTrue(StringUtils.contains(content, "sc\":true")); Assert.assertTrue(StringUtils.contains(content, "sc\":true"));
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment