Fixed #182

core/src/main/java/org/b3log/solo/service/InitService.java

@@ -155,7 +155,6 @@ public final class InitService {
      *     "userName": "",
      *     "userEmail": "",
      *     "userPassword": "", // Unhashed
-     *     "locale": ""
      * }
      * </pre>
      * @throws ServiceException service exception
@@ -214,7 +213,7 @@ public final class InitService {
         final Transaction transaction = userRepository.beginTransaction();
 
         try {
-            helloWorld(requestJSONObject.getString(Keys.LOCALE));
+            helloWorld();
             transaction.commit();
         } catch (final Exception e) {
             if (transaction.isActive()) {
@@ -228,10 +227,9 @@ public final class InitService {
     /**
      * Publishes the first article "Hello World" and the first comment with the specified locale.
      *
-     * @param locale the specified locale
      * @throws Exception exception
      */
-    private void helloWorld(final String locale) throws Exception {
+    private void helloWorld() throws Exception {
         final JSONObject article = new JSONObject();
 
         article.put(Article.ARTICLE_TITLE, langPropsService.get("helloWorld.title"));

core/src/test/java/org/b3log/solo/AbstractTestCase.java

@@ -17,6 +17,7 @@ package org.b3log.solo;
 
 import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
 import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
+import java.util.Locale;
 import org.b3log.latke.Latkes;
 import org.b3log.solo.repository.ArchiveDateArticleRepository;
 import org.b3log.solo.repository.ArchiveDateRepository;
@@ -50,7 +51,7 @@ import org.testng.annotations.BeforeClass;
  * Abstract test case.
  * 
  * @author <a href="mailto:DL88250@gmail.com">Liang Ding</a>
- * @version 1.0.0.4, Feb 7, 2012
+ * @version 1.0.0.5, Feb 8, 2013
  * @see #beforeClass() 
  * @see #afterClass() 
  */
@@ -188,6 +189,7 @@ public abstract class AbstractTestCase {
         localServiceTestHelper.setUp();
 
         Latkes.initRuntimeEnv();
+        Latkes.setLocale(Locale.SIMPLIFIED_CHINESE);
 
         // Repositories
         userRepository = UserRepositoryImpl.getInstance();

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

@@ -19,11 +19,9 @@ import java.util.Date;
 import java.util.List;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.apache.commons.lang.time.DateUtils;
-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;
@@ -49,7 +47,6 @@ 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,7 +22,6 @@ 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;
@@ -50,7 +49,6 @@ 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,7 +20,6 @@ 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;
@@ -48,7 +47,6 @@ 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,7 +22,6 @@ 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;
@@ -50,7 +49,6 @@ 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,7 +26,6 @@ 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;
@@ -53,7 +52,6 @@ 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,10 +15,8 @@
  */
 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;
 
@@ -44,7 +42,6 @@ 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,11 +15,9 @@
  */
 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;
@@ -46,7 +44,6 @@ 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,12 +15,10 @@
  */
 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;
@@ -47,7 +45,6 @@ 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,11 +15,9 @@
  */
 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;
@@ -46,7 +44,6 @@ 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,12 +15,10 @@
  */
 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;
@@ -47,7 +45,6 @@ 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,7 +15,6 @@
  */
 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;
@@ -45,7 +44,6 @@ 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,7 +15,6 @@
  */
 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;
@@ -45,7 +44,6 @@ 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,10 +15,8 @@
  */
 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;
@@ -45,7 +43,6 @@ 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

@@ -17,10 +17,8 @@ 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;
@@ -48,7 +46,6 @@ 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);