PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use external/robolectric-shadows/run_robotests.mk

Browse Source 
This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
This commit is contained in:
James Lemieux
2018-02-26 00:51:42 -08:00
parent 229a6a2bc4
commit 22a39c2b93
752 changed files with 5096 additions and 9182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
View File

@@ -29,7 +29,6 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.support.v7.preference.TwoStatePreference;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.VideoPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -41,13 +40,10 @@ import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class GesturePreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -100,13 +96,13 @@ public class GesturePreferenceControllerTest {
verify(videoPreference).onViewVisible(false);
reset(videoPreference);
savedState.putBoolean(mController.KEY_VIDEO_PAUSED, true);
savedState.putBoolean(GesturePreferenceController.KEY_VIDEO_PAUSED, true);
mController.onCreate(savedState);
mController.onResume();
verify(videoPreference).onViewVisible(true);
reset(videoPreference);
savedState.putBoolean(mController.KEY_VIDEO_PAUSED, false);
savedState.putBoolean(GesturePreferenceController.KEY_VIDEO_PAUSED, false);
mController.onCreate(savedState);
mController.onResume();
verify(videoPreference).onViewVisible(false);
@@ -146,11 +142,11 @@ public class GesturePreferenceControllerTest {
mController.mVideoPaused = true;
mController.onSaveInstanceState(outState);
verify(outState).putBoolean(mController.KEY_VIDEO_PAUSED, true);
verify(outState).putBoolean(GesturePreferenceController.KEY_VIDEO_PAUSED, true);
mController.mVideoPaused = false;
mController.onSaveInstanceState(outState);
verify(outState).putBoolean(mController.KEY_VIDEO_PAUSED, false);
verify(outState).putBoolean(GesturePreferenceController.KEY_VIDEO_PAUSED, false);
}
@Test
@@ -199,7 +195,7 @@ public class GesturePreferenceControllerTest {
boolean mIsPrefAvailable;
boolean mIsPrefEnabled;
public TestPrefController(Context context,
private TestPrefController(Context context,
Lifecycle lifecycle) {
super(context, lifecycle);
}