fix tests

5 files changed, 21 insertions, 18 deletions

diff --git a/app/src/androidTest/java/net/lacolaco/smileessence/twitter/UserStreamListenerTest.java b/app/src/androidTest/java/net/lacolaco/smileessence/twitter/UserStreamListenerTest.java
index fcda127a..3c9f05ba 100644
--- a/app/src/androidTest/java/net/lacolaco/smileessence/twitter/UserStreamListenerTest.java
+++ b/app/src/androidTest/java/net/lacolaco/smileessence/twitter/UserStreamListenerTest.java
@@ -68,7 +68,7 @@ public class UserStreamListenerTest extends ActivityInstrumentationTestCase2<Mai
 
     public void testOnStatus() throws Exception {
         final Status status = mock.getStatusMock();
-        CustomListAdapter<?> home = getActivity().getListAdapter(MainActivity.ADAPTER_HOME);
+        CustomListAdapter<?> home = getActivity().getListAdapter(MainActivity.AdapterID.Home);
         listener.onStatus(status);
         home.updateForce();
         Thread.sleep(500);
@@ -96,7 +96,7 @@ public class UserStreamListenerTest extends ActivityInstrumentationTestCase2<Mai
 
     public void testOnMention() throws Exception {
         final Status status = mock.getReplyMock();
-        CustomListAdapter<?> mentions = getActivity().getListAdapter(MainActivity.ADAPTER_MENTIONS);
+        CustomListAdapter<?> mentions = getActivity().getListAdapter(MainActivity.AdapterID.Mentions);
         listener.onStatus(status);
         mentions.updateForce();
         Thread.sleep(500);
@@ -106,7 +106,7 @@ public class UserStreamListenerTest extends ActivityInstrumentationTestCase2<Mai
     public void testOnRetweeted() throws Exception {
         final Status status = mock.getRetweetMock();
         listener.onStatus(status);
-        CustomListAdapter<?> home = getActivity().getListAdapter(MainActivity.ADAPTER_HOME);
+        CustomListAdapter<?> home = getActivity().getListAdapter(MainActivity.AdapterID.Home);
         home.updateForce();
         Thread.sleep(500);
         assertEquals(1, home.getCount());
@@ -115,7 +115,7 @@ public class UserStreamListenerTest extends ActivityInstrumentationTestCase2<Mai
     public void testOnFavorited() throws Exception {
         final Status status = mock.getReplyMock();
         final User source = status.getUser();
-        CustomListAdapter<?> history = getActivity().getListAdapter(MainActivity.ADAPTER_HISTORY);
+        CustomListAdapter<?> history = getActivity().getListAdapter(MainActivity.AdapterID.History);
         listener.onFavorite(source, user, status);
         history.updateForce();
         Thread.sleep(500);
@@ -128,7 +128,7 @@ public class UserStreamListenerTest extends ActivityInstrumentationTestCase2<Mai
 
     public void testOnFollow() throws Exception {
         final User source = mock.getUserMock();
-        CustomListAdapter<?> history = getActivity().getListAdapter(MainActivity.ADAPTER_HISTORY);
+        CustomListAdapter<?> history = getActivity().getListAdapter(MainActivity.AdapterID.History);
         listener.onFollow(source, user);
         history.updateForce();
         Thread.sleep(500);
@@ -137,7 +137,7 @@ public class UserStreamListenerTest extends ActivityInstrumentationTestCase2<Mai
 
     public void testOnBlock() throws Exception {
         final User source = mock.getUserMock();
-        CustomListAdapter<?> history = getActivity().getListAdapter(MainActivity.ADAPTER_HISTORY);
+        CustomListAdapter<?> history = getActivity().getListAdapter(MainActivity.AdapterID.History);
         listener.onBlock(source, user);
         listener.onUnblock(source, user);
         history.updateForce();
@@ -147,7 +147,7 @@ public class UserStreamListenerTest extends ActivityInstrumentationTestCase2<Mai
 
     public void testOnDirectMessage() throws Exception {
         final DirectMessage message = mock.getDirectMessageMock();
-        CustomListAdapter<?> messages = getActivity().getListAdapter(MainActivity.ADAPTER_MESSAGES);
+        CustomListAdapter<?> messages = getActivity().getListAdapter(MainActivity.AdapterID.Messages);
         listener.onDirectMessage(message);
         messages.updateForce();
         Thread.sleep(500);
diff --git a/app/src/androidTest/java/net/lacolaco/smileessence/view/adapter/CustomListAdapterTest.java b/app/src/androidTest/java/net/lacolaco/smileessence/view/adapter/CustomListAdapterTest.java
index 7722f1a6..fa176a88 100644
--- a/app/src/androidTest/java/net/lacolaco/smileessence/view/adapter/CustomListAdapterTest.java
+++ b/app/src/androidTest/java/net/lacolaco/smileessence/view/adapter/CustomListAdapterTest.java
@@ -44,7 +44,7 @@ public class CustomListAdapterTest extends ActivityInstrumentationTestCase2<Main
     @Override
     public void setUp() throws Exception {
         mock = new TwitterMock(getInstrumentation().getContext());
-        adapter = new CustomListAdapter<>(getActivity(), StatusViewModel.class);
+        adapter = new CustomListAdapter<>(getActivity());
         account = mock.getAccount();
     }
 
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
index 29ef9e82..3e65742f 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
@@ -38,7 +38,6 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.WindowManager;
-import android.widget.Adapter;
 import android.widget.ImageView;
 
 import net.lacolaco.smileessence.Application;
@@ -100,7 +99,7 @@ public class MainActivity extends Activity {
     private int pageIndexHistory;
     private int pageIndexMessages;
     private int pageIndexSearch;
-    private int pageIndexUserlist;
+    private int pageIndexUserList;
     private ViewPager viewPager;
     private PageListAdapter pagerAdapter;
     private Account currentAccount;
@@ -164,6 +163,10 @@ public class MainActivity extends Activity {
         return pageIndexHome;
     }
 
+    public int getPageIndexMentions() {
+        return pageIndexMentions;
+    }
+
     public int getPageIndexHistory() {
         return pageIndexHistory;
     }
@@ -176,8 +179,8 @@ public class MainActivity extends Activity {
         return pageIndexSearch;
     }
 
-    public int getPageIndexUserlist() {
-        return pageIndexUserlist;
+    public int getPageIndexUserList() {
+        return pageIndexUserList;
     }
 
     public PageListAdapter getPagerAdapter() {
@@ -536,7 +539,7 @@ public class MainActivity extends Activity {
         boolean visible = getUserPreferenceHelper().getValue(R.string.key_page_list_visibility, true);
         getUserPreferenceHelper().putValue(R.string.key_page_list_visibility, visible);
         UserListListAdapter userListAdapter = new UserListListAdapter(this);
-        pageIndexUserlist = addListPage(getString(R.string.page_name_list), UserListFragment.class, userListAdapter, AdapterID.UserList, visible);
+        pageIndexUserList = addListPage(getString(R.string.page_name_list), UserListFragment.class, userListAdapter, AdapterID.UserList, visible);
     }
 
     private void getImageUri(int requestCode, int resultCode, Intent data) {
@@ -640,7 +643,7 @@ public class MainActivity extends Activity {
     }
 
     private void initUserList(Twitter twitter) {
-        if (pageIndexUserlist == PAGE_INDEX_GONE) {
+        if (pageIndexUserList == PAGE_INDEX_GONE) {
             return;
         }
         String lastUserList = getLastUserList();
@@ -679,7 +682,7 @@ public class MainActivity extends Activity {
     }
 
     private void openUserListPage() {
-        setSelectedPageIndex(pageIndexUserlist);
+        setSelectedPageIndex(pageIndexUserList);
     }
 
     private void receiveOAuth(int requestCode, int resultCode, Intent data) {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java b/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java
index 8b7b47a2..84585ebf 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/CustomListAdapter.java
@@ -152,7 +152,7 @@ public class CustomListAdapter<T extends IViewModel> extends BaseAdapter {
         }
     }
 
-    public void sort() {
+    protected void sort() {
     }
 
     public void update() {
diff --git a/app/src/main/java/net/lacolaco/smileessence/view/adapter/StatusListAdapter.java b/app/src/main/java/net/lacolaco/smileessence/view/adapter/StatusListAdapter.java
index f2b4854d..ece2eea8 100644
--- a/app/src/main/java/net/lacolaco/smileessence/view/adapter/StatusListAdapter.java
+++ b/app/src/main/java/net/lacolaco/smileessence/view/adapter/StatusListAdapter.java
@@ -74,10 +74,10 @@ public class StatusListAdapter extends CustomListAdapter<StatusViewModel> {
     }
 
     /**
-     * Sort list by Status#createdAt
+     * Sort list by Status ID
      */
     @Override
-    public void sort() {
+    protected void sort() {
         synchronized (LOCK) {
             Collections.sort(list, new Comparator<StatusViewModel>() {
                 @Override