测试用列修复

core/src/test/java/org/b3log/solo/service/ArchiveDateQueryServiceTestCase.java

@@ -17,9 +17,12 @@ package org.b3log.solo.service;
 
 import java.util.Date;
 import java.util.List;
+
+import org.b3log.latke.Keys;
 import org.b3log.latke.model.User;
 import org.b3log.solo.AbstractTestCase;
 import org.b3log.solo.model.ArchiveDate;
+import org.b3log.solo.model.Preference;
 import org.json.JSONObject;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -28,7 +31,7 @@ import org.testng.annotations.Test;
  * {@link ArchiveDateQueryService} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.0, Feb 7, 2012
+ * @version 1.0.0.1, Sep 11, 2012
  */
 public class ArchiveDateQueryServiceTestCase extends AbstractTestCase {
 
@@ -45,6 +48,7 @@ public class ArchiveDateQueryServiceTestCase extends AbstractTestCase {
         requestJSONObject.put(User.USER_EMAIL, "test@gmail.com");
         requestJSONObject.put(User.USER_NAME, "Admin");
         requestJSONObject.put(User.USER_PASSWORD, "pass");
+        requestJSONObject.put(Keys.LOCALE, Preference.Default.DEFAULT_LANGUAGE);
 
         initService.init(requestJSONObject);
 

core/src/test/java/org/b3log/solo/service/ArticleMgmtServiceTestCase.java

@@ -22,6 +22,7 @@ import org.b3log.latke.util.Requests;
 import org.b3log.solo.AbstractTestCase;
 import org.b3log.solo.model.Article;
 import org.b3log.solo.model.Common;
+import org.b3log.solo.model.Preference;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.testng.Assert;
@@ -31,7 +32,7 @@ import org.testng.annotations.Test;
  * {@link ArticleMgmtService} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.4, Feb 25, 2012
+ * @version 1.0.0.5, Sep 11, 2012
  */
 @Test(suiteName = "service")
 public class ArticleMgmtServiceTestCase extends AbstractTestCase {
@@ -49,6 +50,7 @@ public class ArticleMgmtServiceTestCase extends AbstractTestCase {
         requestJSONObject.put(User.USER_EMAIL, "test@gmail.com");
         requestJSONObject.put(User.USER_NAME, "Admin");
         requestJSONObject.put(User.USER_PASSWORD, "pass");
+        requestJSONObject.put(Keys.LOCALE, Preference.Default.DEFAULT_LANGUAGE);
         
         initService.init(requestJSONObject);
 

core/src/test/java/org/b3log/solo/service/ArticleQueryServiceTestCase.java

@@ -20,6 +20,7 @@ import org.b3log.latke.Keys;
 import org.b3log.latke.model.User;
 import org.b3log.solo.AbstractTestCase;
 import org.b3log.solo.model.Article;
+import org.b3log.solo.model.Preference;
 import org.b3log.solo.model.Tag;
 import org.json.JSONObject;
 import org.testng.Assert;
@@ -29,7 +30,7 @@ import org.testng.annotations.Test;
  * {@link ArticleQueryService} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.0, Jan 9, 2012
+ * @version 1.0.0.1, Sep 11, 2012
  */
 @Test(suiteName = "service")
 public class ArticleQueryServiceTestCase extends AbstractTestCase {
@@ -47,6 +48,7 @@ public class ArticleQueryServiceTestCase extends AbstractTestCase {
         requestJSONObject.put(User.USER_EMAIL, "test@gmail.com");
         requestJSONObject.put(User.USER_NAME, "Admin");
         requestJSONObject.put(User.USER_PASSWORD, "pass");
+        requestJSONObject.put(Keys.LOCALE, Preference.Default.DEFAULT_LANGUAGE);
 
         initService.init(requestJSONObject);
 

core/src/test/java/org/b3log/solo/service/CommentMgmtServiceTestCase.java

@@ -22,6 +22,7 @@ import org.b3log.latke.util.Requests;
 import org.b3log.solo.AbstractTestCase;
 import org.b3log.solo.model.Comment;
 import org.b3log.solo.model.Page;
+import org.b3log.solo.model.Preference;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.testng.Assert;
@@ -31,7 +32,7 @@ import org.testng.annotations.Test;
  * {@link CommentMgmtService} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.1, Feb 25, 2012
+ * @version 1.0.0.2, Sep 11, 2012
  */
 @Test(suiteName = "service")
 public class CommentMgmtServiceTestCase extends AbstractTestCase {
@@ -49,6 +50,7 @@ public class CommentMgmtServiceTestCase extends AbstractTestCase {
         requestJSONObject.put(User.USER_EMAIL, "test@gmail.com");
         requestJSONObject.put(User.USER_NAME, "Admin");
         requestJSONObject.put(User.USER_PASSWORD, "pass");
+        requestJSONObject.put(Keys.LOCALE, Preference.Default.DEFAULT_LANGUAGE);
 
         initService.init(requestJSONObject);
 

core/src/test/java/org/b3log/solo/service/CommentQueryServiceTestCase.java

@@ -26,6 +26,7 @@ import org.b3log.latke.util.Requests;
 import org.b3log.solo.AbstractTestCase;
 import org.b3log.solo.model.Article;
 import org.b3log.solo.model.Comment;
+import org.b3log.solo.model.Preference;
 import org.json.JSONObject;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -34,7 +35,7 @@ import org.testng.annotations.Test;
  * {@link CommentQueryService} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.0, Feb 2, 2012
+ * @version 1.0.0.1, Sep 11, 2012
  */
 @Test(suiteName = "service")
 public class CommentQueryServiceTestCase extends AbstractTestCase {
@@ -52,6 +53,7 @@ public class CommentQueryServiceTestCase extends AbstractTestCase {
         requestJSONObject.put(User.USER_EMAIL, "test@gmail.com");
         requestJSONObject.put(User.USER_NAME, "Admin");
         requestJSONObject.put(User.USER_PASSWORD, "pass");
+        requestJSONObject.put(Keys.LOCALE, Preference.Default.DEFAULT_LANGUAGE);
 
         initService.init(requestJSONObject);
 

core/src/test/java/org/b3log/solo/service/InitServiceTestCase.java

@@ -15,8 +15,10 @@
  */
 package org.b3log.solo.service;
 
+import org.b3log.latke.Keys;
 import org.b3log.latke.model.User;
 import org.b3log.solo.AbstractTestCase;
+import org.b3log.solo.model.Preference;
 import org.json.JSONObject;
 import org.testng.Assert;
 
@@ -24,7 +26,7 @@ import org.testng.Assert;
  * {@link InitService} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.1, Jan 7, 2012
+ * @version 1.0.0.2, Sep 11, 2012
  */
 //@Test(suiteName = "service")
 public class InitServiceTestCase extends AbstractTestCase {
@@ -42,6 +44,7 @@ public class InitServiceTestCase extends AbstractTestCase {
         requestJSONObject.put(User.USER_EMAIL, "test@b3log.org");
         requestJSONObject.put(User.USER_NAME, "Admin");
         requestJSONObject.put(User.USER_PASSWORD, "pass");
+        requestJSONObject.put(Keys.LOCALE, Preference.Default.DEFAULT_LANGUAGE);
 
         initService.init(requestJSONObject);
 

core/src/test/java/org/b3log/solo/service/LinkMgmtServiceTestCase.java

@@ -15,9 +15,11 @@
  */
 package org.b3log.solo.service;
 
+import org.b3log.latke.Keys;
 import org.b3log.latke.model.User;
 import org.b3log.solo.AbstractTestCase;
 import org.b3log.solo.model.Link;
+import org.b3log.solo.model.Preference;
 import org.json.JSONObject;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -26,7 +28,7 @@ import org.testng.annotations.Test;
  * {@link LinkMgmtService} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.0, Feb 1, 2012
+ * @version 1.0.0.1, Sep 11, 2012
  */
 @Test(suiteName = "service")
 public class LinkMgmtServiceTestCase extends AbstractTestCase {
@@ -44,6 +46,7 @@ public class LinkMgmtServiceTestCase extends AbstractTestCase {
         requestJSONObject.put(User.USER_EMAIL, "test@gmail.com");
         requestJSONObject.put(User.USER_NAME, "Admin");
         requestJSONObject.put(User.USER_PASSWORD, "pass");
+        requestJSONObject.put(Keys.LOCALE, Preference.Default.DEFAULT_LANGUAGE);
 
         initService.init(requestJSONObject);
 

core/src/test/java/org/b3log/solo/service/LinkQueryServiceTestCase.java

@@ -15,10 +15,12 @@
  */
 package org.b3log.solo.service;
 
+import org.b3log.latke.Keys;
 import org.b3log.latke.model.User;
 import org.b3log.latke.util.Requests;
 import org.b3log.solo.AbstractTestCase;
 import org.b3log.solo.model.Link;
+import org.b3log.solo.model.Preference;
 import org.json.JSONObject;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -27,7 +29,7 @@ import org.testng.annotations.Test;
  * {@link LinkQueryService} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.0, Feb 1, 2012
+ * @version 1.0.0.1, Sep 11, 2012
  */
 @Test(suiteName = "service")
 public class LinkQueryServiceTestCase extends AbstractTestCase {
@@ -45,6 +47,7 @@ public class LinkQueryServiceTestCase extends AbstractTestCase {
         requestJSONObject.put(User.USER_EMAIL, "test@gmail.com");
         requestJSONObject.put(User.USER_NAME, "Admin");
         requestJSONObject.put(User.USER_PASSWORD, "pass");
+        requestJSONObject.put(Keys.LOCALE, Preference.Default.DEFAULT_LANGUAGE);
 
         initService.init(requestJSONObject);
 

core/src/test/java/org/b3log/solo/service/PageMgmtServiceTestCase.java

@@ -15,9 +15,11 @@
  */
 package org.b3log.solo.service;
 
+import org.b3log.latke.Keys;
 import org.b3log.latke.model.User;
 import org.b3log.solo.AbstractTestCase;
 import org.b3log.solo.model.Page;
+import org.b3log.solo.model.Preference;
 import org.json.JSONObject;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -26,7 +28,7 @@ import org.testng.annotations.Test;
  * {@link PageMgmtService} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.1, Feb 25, 2012
+ * @version 1.0.0.2, Sep 11, 2012
  */
 @Test(suiteName = "service")
 public class PageMgmtServiceTestCase extends AbstractTestCase {
@@ -44,6 +46,7 @@ public class PageMgmtServiceTestCase extends AbstractTestCase {
         requestJSONObject.put(User.USER_EMAIL, "test@gmail.com");
         requestJSONObject.put(User.USER_NAME, "Admin");
         requestJSONObject.put(User.USER_PASSWORD, "pass");
+        requestJSONObject.put(Keys.LOCALE, Preference.Default.DEFAULT_LANGUAGE);
 
         initService.init(requestJSONObject);
 

core/src/test/java/org/b3log/solo/service/PageQueryServiceTestCase.java

@@ -15,10 +15,12 @@
  */
 package org.b3log.solo.service;
 
+import org.b3log.latke.Keys;
 import org.b3log.latke.model.User;
 import org.b3log.latke.util.Requests;
 import org.b3log.solo.AbstractTestCase;
 import org.b3log.solo.model.Page;
+import org.b3log.solo.model.Preference;
 import org.json.JSONObject;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -27,7 +29,7 @@ import org.testng.annotations.Test;
  * {@link PageQueryService} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.1, Feb 25, 2012
+ * @version 1.0.0.2, Sep 11, 2012
  */
 @Test(suiteName = "service")
 public class PageQueryServiceTestCase extends AbstractTestCase {
@@ -45,6 +47,7 @@ public class PageQueryServiceTestCase extends AbstractTestCase {
         requestJSONObject.put(User.USER_EMAIL, "test@gmail.com");
         requestJSONObject.put(User.USER_NAME, "Admin");
         requestJSONObject.put(User.USER_PASSWORD, "pass");
+        requestJSONObject.put(Keys.LOCALE, Preference.Default.DEFAULT_LANGUAGE);
 
         initService.init(requestJSONObject);
 

core/src/test/java/org/b3log/solo/service/PreferenceMgmtServiceTestCase.java

@@ -15,6 +15,7 @@
  */
 package org.b3log.solo.service;
 
+import org.b3log.latke.Keys;
 import org.b3log.latke.model.User;
 import org.b3log.solo.AbstractTestCase;
 import org.b3log.solo.model.Preference;
@@ -26,7 +27,7 @@ import org.testng.annotations.Test;
  * {@link PreferenceMgmtService} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.0, Feb 1, 2012
+ * @version 1.0.0.1, Sep 11, 2012
  */
 @Test(suiteName = "service")
 public class PreferenceMgmtServiceTestCase extends AbstractTestCase {
@@ -44,6 +45,7 @@ public class PreferenceMgmtServiceTestCase extends AbstractTestCase {
         requestJSONObject.put(User.USER_EMAIL, "test@gmail.com");
         requestJSONObject.put(User.USER_NAME, "Admin");
         requestJSONObject.put(User.USER_PASSWORD, "pass");
+        requestJSONObject.put(Keys.LOCALE, Preference.Default.DEFAULT_LANGUAGE);
 
         initService.init(requestJSONObject);
 

core/src/test/java/org/b3log/solo/service/PreferenceQueryServiceTestCase.java

@@ -15,6 +15,7 @@
  */
 package org.b3log.solo.service;
 
+import org.b3log.latke.Keys;
 import org.b3log.latke.model.User;
 import org.b3log.solo.AbstractTestCase;
 import org.b3log.solo.model.Preference;
@@ -26,7 +27,7 @@ import org.testng.annotations.Test;
  * {@link PreferenceQueryService} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.0, Feb 1, 2012
+ * @version 1.0.0.1, Sep  11, 2012
  */
 @Test(suiteName = "service")
 public class PreferenceQueryServiceTestCase extends AbstractTestCase {
@@ -44,6 +45,7 @@ public class PreferenceQueryServiceTestCase extends AbstractTestCase {
         requestJSONObject.put(User.USER_EMAIL, "test@gmail.com");
         requestJSONObject.put(User.USER_NAME, "Admin");
         requestJSONObject.put(User.USER_PASSWORD, "pass");
+        requestJSONObject.put(Keys.LOCALE, Preference.Default.DEFAULT_LANGUAGE);
 
         initService.init(requestJSONObject);
 

core/src/test/java/org/b3log/solo/service/TagMgmtServiceTestCase.java

@@ -15,8 +15,10 @@
  */
 package org.b3log.solo.service;
 
+import org.b3log.latke.Keys;
 import org.b3log.latke.model.User;
 import org.b3log.solo.AbstractTestCase;
+import org.b3log.solo.model.Preference;
 import org.json.JSONObject;
 import org.testng.Assert;
 import org.testng.annotations.Test;
@@ -25,7 +27,7 @@ import org.testng.annotations.Test;
  * {@link TagMgmtService} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.0, Feb 2, 2012
+ * @version 1.0.0.1, Sep 11, 2012
  */
 @Test(suiteName = "service")
 public class TagMgmtServiceTestCase extends AbstractTestCase {
@@ -43,6 +45,7 @@ public class TagMgmtServiceTestCase extends AbstractTestCase {
         requestJSONObject.put(User.USER_EMAIL, "test@gmail.com");
         requestJSONObject.put(User.USER_NAME, "Admin");
         requestJSONObject.put(User.USER_PASSWORD, "pass");
+        requestJSONObject.put(Keys.LOCALE, Preference.Default.DEFAULT_LANGUAGE);
 
         initService.init(requestJSONObject);
 

core/src/test/java/org/b3log/solo/service/TagQueryServiceTestCase.java

@@ -16,8 +16,11 @@
 package org.b3log.solo.service;
 
 import java.util.List;
+
+import org.b3log.latke.Keys;
 import org.b3log.latke.model.User;
 import org.b3log.solo.AbstractTestCase;
+import org.b3log.solo.model.Preference;
 import org.b3log.solo.model.Tag;
 import org.json.JSONObject;
 import org.testng.Assert;
@@ -27,7 +30,7 @@ import org.testng.annotations.Test;
  * {@link TagQueryService} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.0, Feb 2, 2012
+ * @version 1.0.0.1, Sep 11, 2012
  */
 @Test(suiteName = "service")
 public class TagQueryServiceTestCase extends AbstractTestCase {
@@ -45,6 +48,7 @@ public class TagQueryServiceTestCase extends AbstractTestCase {
         requestJSONObject.put(User.USER_EMAIL, "test@gmail.com");
         requestJSONObject.put(User.USER_NAME, "Admin");
         requestJSONObject.put(User.USER_PASSWORD, "pass");
+        requestJSONObject.put(Keys.LOCALE, Preference.Default.DEFAULT_LANGUAGE);
 
         initService.init(requestJSONObject);
 

core/src/test/java/org/b3log/solo/util/MarkdownsTestCase.java

@@ -17,6 +17,7 @@ package org.b3log.solo.util;
 
 import java.io.FileInputStream;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.util.List;
 import org.apache.commons.io.IOUtils;
 import org.b3log.latke.util.Stopwatchs;
@@ -28,7 +29,7 @@ import org.testng.Assert;
  * {@link org.b3log.solo.util.Markdowns} test case.
  *
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.0, Apr 28, 2012
+ * @version 1.0.0.1, Sep 11, 2012
  * @since 0.4.5
  */
 public final class MarkdownsTestCase {
@@ -52,11 +53,12 @@ public final class MarkdownsTestCase {
 
         System.out.println(MarkdownsTestCase.class.getResource("/"));
         final URL testFile = MarkdownsTestCase.class.getResource("/markdown_syntax.text");
-        System.out.println(testFile.getFile());
+        final String path = URLDecoder.decode(testFile.getPath(), "UTF-8");
+        System.out.println(path);
 
         final StringBuilder markdownTextBuilder = new StringBuilder();
         @SuppressWarnings("unchecked")
-        final List<String> lines = IOUtils.readLines(new FileInputStream(testFile.getFile()));
+        final List<String> lines = IOUtils.readLines(new FileInputStream(path));
         
         for (final String line : lines) {
             markdownTextBuilder.append(line).append(Strings.LINE_SEPARATOR);

core/src/test/resources/lang_zh_CN.properties

+#
+# Copyright (c) 2009, 2010, 2011, 2012, B3log Team
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# Description: B3log Solo default language configurations(zh_CN) for testing.
+# Version: 1.0.0.0, Sep 11, 2012
+# Author: Liang Ding
+#
+
+helloWorld.title=\u4e16\u754c\uff0c\u4f60\u597d\uff01
+helloWorld.content=\u6b22\u8fce\u4f7f\u7528 \
+<a style="text-decoration: none;" target="_blank" href="https://github.com/b3log/b3log-solo">\
+<span style="color: orange;">B</span>\
+<span style="font-size: 9px; color: blue;">\
+<sup>3</sup></span><span style="color: green;">L</span>\
+<span style="color: red;">O</span>\
+<span style="color: blue;">G</span> \
+<span style="color: orangered; font-weight: bold;">Solo</span></a>\
+\u3002\u8fd9\u662f\u7cfb\u7edf\u81ea\u52a8\u751f\u6210\u7684\u6f14\u793a\u6587\u7ae0\u3002\u7f16\u8f91\u6216\u8005\u5220\u9664\u5b83\uff0c\u7136\u540e\u5f00\u59cb\u60a8\u7684\u535a\u5ba2\uff01
+helloWorld.comment.content=\u60a8\u597d\uff0c\u8fd9\u662f\u4e00\u6761\u8bc4\u8bba\u3002_esc_enter_88250_\u8981\u5220\u9664\u8bc4\u8bba\uff0c\u8bf7\u5148\u767b\u5f55\uff0c\u7136\u540e\u518d\u67e5\u770b\u8fd9\u7bc7\u6587\u7ae0\u7684\u8bc4\u8bba\u3002\u5728\u90a3\u91cc\uff0c\u60a8\u53ef\u4ee5\u770b\u5230\u7f16\u8f91\u6216\u8005\u5220\u9664\u8bc4\u8bba\u7684\u9009\u9879\u3002