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

Merge "SearchView keyboard opens and closes appropriately"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-18 01:41:35 +00:00
committed by Android (Google) Code Review
parent c4dafb43d3 592e4d739b
commit f1c80deab0
3 changed files with 87 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tests/app/src/com/android/settings/search2/SearchFragmentEspressoTest.java Normal file
View File

@@ -0,0 +1,49 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* 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.
*
*/
package com.android.settings.search2;
import android.support.test.filters.SmallTest;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.widget.SearchView;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.matcher.ViewMatchers.hasFocus;
import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
import static android.support.test.espresso.matcher.ViewMatchers.withTagKey;
import static android.support.test.espresso.assertion.ViewAssertions.matches;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.core.AllOf.allOf;
@RunWith(AndroidJUnit4.class)
@SmallTest
public class SearchFragmentEspressoTest {
@Rule
public ActivityTestRule<SearchActivity> mActivityRule =
new ActivityTestRule<>(SearchActivity.class, true, true);
@Test
public void test_OpenKeyboardOnSearchLaunch() {
onView(allOf(hasFocus(), withTagKey(SearchFragment.SEARCH_TAG)))
.check(matches(withClassName(containsString(SearchView.class.getName()))));
}
}

8
tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java
View File

@@ -20,16 +20,12 @@ import android.content.Context;
import android.content.Loader;
import android.os.Bundle;
import android.os.UserManager;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.dashboard.SiteMapManager;
import com.android.settings.testutils.DatabaseTestUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -41,14 +37,11 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.util.ActivityController;
import java.util.ArrayList;
import java.util.List;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
@@ -248,5 +241,4 @@ public class SearchFragmentTest {
verify(fragment, times(2)).onLoadFinished(any(Loader.class), any(List.class));
}
}