diff options
author | Yorke Lee <yorkelee@google.com> | 2014-10-29 22:33:24 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-29 22:33:25 +0000 |
commit | 35741bb2f60cf438595950d08d078962e6cac3af (patch) | |
tree | 002cac58ea230f94670cb4f1af9df6ecaf6d4ed7 /tests/src/com/android/dialer/widget/ActionBarControllerTest.java | |
parent | ad6ef4b1c6a7bdea722771fc1b4cc6885dbbe0ac (diff) | |
parent | c98a5bb2d806dde99325a15466a2bf144d216ae8 (diff) |
Merge "Refactor ActionBarController and tests" into lmp-mr1-dev
Diffstat (limited to 'tests/src/com/android/dialer/widget/ActionBarControllerTest.java')
-rw-r--r-- | tests/src/com/android/dialer/widget/ActionBarControllerTest.java | 47 |
1 files changed, 9 insertions, 38 deletions
diff --git a/tests/src/com/android/dialer/widget/ActionBarControllerTest.java b/tests/src/com/android/dialer/widget/ActionBarControllerTest.java index 2e388380f..316c15537 100644 --- a/tests/src/com/android/dialer/widget/ActionBarControllerTest.java +++ b/tests/src/com/android/dialer/widget/ActionBarControllerTest.java @@ -16,54 +16,25 @@ package com.android.dialer.widget; -import android.app.ActionBar; -import android.app.Activity; import android.content.Context; -import android.test.ActivityInstrumentationTestCase2; -import android.test.AndroidTestCase; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.SmallTest; -import android.view.View; -import com.android.dialer.DialtactsActivity; import com.android.dialer.widget.ActionBarController.ActivityUi; -import com.android.internal.app.WindowDecorActionBar; @SmallTest -public class ActionBarControllerTest extends ActivityInstrumentationTestCase2<DialtactsActivity> { +public class ActionBarControllerTest extends InstrumentationTestCase { private static final int ACTION_BAR_HEIGHT = 100; private ActionBarController mActionBarController; private SearchEditTextLayout mSearchBox; private MockActivityUi mActivityUi; - private class MockActionBar extends WindowDecorActionBar { - private int mHideOffset = 0; - - public MockActionBar(Activity activity) { - super(activity); - } - - @Override - public void setHideOffset(int offset) { - mHideOffset = offset; - } - - @Override - public int getHideOffset() { - return mHideOffset; - } - } - private class MockActivityUi implements ActivityUi { boolean isInSearchUi; boolean hasSearchQuery; boolean shouldShowActionBar; - private ActionBar mActionBar; - - public MockActivityUi() { - mActionBar = new MockActionBar(getActivity()); - } + int actionBarHideOffset; @Override public boolean isInSearchUi() { @@ -86,8 +57,13 @@ public class ActionBarControllerTest extends ActivityInstrumentationTestCase2<Di } @Override - public ActionBar getActionBar() { - return mActionBar; + public int getActionBarHideOffset() { + return actionBarHideOffset; + } + + @Override + public void setActionBarHideOffset(int offset) { + actionBarHideOffset = offset; } } @@ -111,11 +87,6 @@ public class ActionBarControllerTest extends ActivityInstrumentationTestCase2<Di } } - public ActionBarControllerTest() { - super(DialtactsActivity.class); - } - - @Override protected void setUp() { mActivityUi = new MockActivityUi(); |