Move JUnit tests not from telephony settings into legacy directory.
In order to enable the junit tests as a blocking presubmit, we want to ensure that all tests within this directory are being actively maintained. A number of these tests were migrated to robolectric sometime in 2017-2018, and because they are no longer maintained this CL moves them into a separate folder, so that they will not be included in the presubmit. Please verify that this is the appropriate action to take for these tests. In the future, the settings team may decide to delete this legacy directory entirely. Note that AutoSelectPreferenceControllerTest.setChecked_isChecked_showProgressDialog is currently failing, but we can fix it in a separate CL. Test: make SettingsUnitTests && adb install -r out/target/product/shamu/testcases/SettingsUnitTests/arm64/SettingsUnitTests.apk Change-Id: Iafc15b9ac69b5ca2fec76d3c0c7e247ea0017d49
This commit is contained in:
@@ -1,69 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2016 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.search;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.provider.SearchIndexablesContract;
|
||||
|
||||
import androidx.test.filters.SmallTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class SearchIndexablesContractTest {
|
||||
|
||||
@Test
|
||||
public void testRawColumns_matchContractIndexing() {
|
||||
assertThat(SearchIndexablesContract.RawData.COLUMN_RANK)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[0]);
|
||||
assertThat(SearchIndexablesContract.RawData.COLUMN_TITLE)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[1]);
|
||||
assertThat(SearchIndexablesContract.RawData.COLUMN_SUMMARY_ON)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[2]);
|
||||
assertThat(SearchIndexablesContract.RawData.COLUMN_SUMMARY_OFF)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[3]);
|
||||
assertThat(SearchIndexablesContract.RawData.COLUMN_ENTRIES)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[4]);
|
||||
assertThat(SearchIndexablesContract.RawData.COLUMN_KEYWORDS)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[5]);
|
||||
assertThat(SearchIndexablesContract.RawData.COLUMN_SCREEN_TITLE)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[6]);
|
||||
assertThat(SearchIndexablesContract.RawData.COLUMN_CLASS_NAME)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[7]);
|
||||
assertThat(SearchIndexablesContract.RawData.COLUMN_ICON_RESID)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[8]);
|
||||
assertThat(SearchIndexablesContract.RawData.COLUMN_INTENT_ACTION)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[9]);
|
||||
assertThat(SearchIndexablesContract.RawData.COLUMN_INTENT_TARGET_PACKAGE)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[10]);
|
||||
assertThat(SearchIndexablesContract.RawData.COLUMN_INTENT_TARGET_CLASS)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[11]);
|
||||
assertThat(SearchIndexablesContract.RawData.COLUMN_KEY)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[12]);
|
||||
assertThat(SearchIndexablesContract.RawData.COLUMN_USER_ID)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[13]);
|
||||
assertThat(SearchIndexablesContract.RawData.PAYLOAD_TYPE)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[14]);
|
||||
assertThat(SearchIndexablesContract.RawData.PAYLOAD)
|
||||
.isEqualTo(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS[15]);
|
||||
}
|
||||
}
|
@@ -1,55 +0,0 @@
|
||||
/*
|
||||
* 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.search;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.pm.ResolveInfo;
|
||||
|
||||
import androidx.test.InstrumentationRegistry;
|
||||
import androidx.test.filters.SmallTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
@SmallTest
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class SearchResultTrampolineTest {
|
||||
|
||||
private Context mContext;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = InstrumentationRegistry.getTargetContext();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void canLaunchSettingsTrampolineWithIntentAction() {
|
||||
final PackageManager pm = mContext.getPackageManager();
|
||||
final ResolveInfo info =
|
||||
pm.resolveActivity(new Intent("com.android.settings.SEARCH_RESULT_TRAMPOLINE"), 0);
|
||||
|
||||
assertThat(info.activityInfo.name)
|
||||
.isEqualTo(SearchResultTrampoline.class.getName());
|
||||
|
||||
}
|
||||
}
|
@@ -1,86 +0,0 @@
|
||||
/*
|
||||
* 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.search;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import android.content.Context;
|
||||
import android.database.Cursor;
|
||||
import android.net.Uri;
|
||||
import android.platform.test.annotations.Presubmit;
|
||||
import android.provider.SearchIndexablesContract;
|
||||
|
||||
import androidx.test.InstrumentationRegistry;
|
||||
import androidx.test.filters.SmallTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
@SmallTest
|
||||
public class SettingsSearchIndexablesProviderTest {
|
||||
|
||||
private Context mContext;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = InstrumentationRegistry.getTargetContext();
|
||||
}
|
||||
|
||||
@After
|
||||
public void cleanUp() {
|
||||
System.clearProperty(SettingsSearchIndexablesProvider.SYSPROP_CRASH_ON_ERROR);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSiteMapPairsFetched() {
|
||||
final Uri uri = Uri.parse("content://" + mContext.getPackageName() + "/" +
|
||||
SearchIndexablesContract.SITE_MAP_PAIRS_PATH);
|
||||
final Cursor cursor = mContext.getContentResolver().query(uri, null, null, null, null);
|
||||
|
||||
final int size = cursor.getCount();
|
||||
assertThat(size).isGreaterThan(0);
|
||||
while (cursor.moveToNext()) {
|
||||
assertThat(cursor.getString(cursor.getColumnIndexOrThrow(
|
||||
SearchIndexablesContract.SiteMapColumns.PARENT_CLASS)))
|
||||
.isNotEmpty();
|
||||
assertThat(cursor.getString(cursor.getColumnIndexOrThrow(
|
||||
SearchIndexablesContract.SiteMapColumns.CHILD_CLASS)))
|
||||
.isNotEmpty();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* All {@link Indexable.SearchIndexProvider} should collect a list of non-indexable keys
|
||||
* without crashing. This test enables crashing of individual providers in the indexing pipeline
|
||||
* and checks that there are no crashes.
|
||||
*/
|
||||
@Test
|
||||
@Presubmit
|
||||
public void nonIndexableKeys_shouldNotCrash() {
|
||||
// Allow crashes in the indexing pipeline.
|
||||
System.setProperty(SettingsSearchIndexablesProvider.SYSPROP_CRASH_ON_ERROR,
|
||||
"enabled");
|
||||
|
||||
final Uri uri = Uri.parse("content://" + mContext.getPackageName() + "/" +
|
||||
SearchIndexablesContract.NON_INDEXABLES_KEYS_PATH);
|
||||
mContext.getContentResolver().query(uri, null, null, null, null);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user