diff options
author | Makoto Onuki <omakoto@google.com> | 2016-02-22 15:18:36 -0800 |
---|---|---|
committer | Makoto Onuki <omakoto@google.com> | 2016-02-22 15:18:36 -0800 |
commit | 03bfa415fab150deb666b1b5aad5913511bd7d33 (patch) | |
tree | 639245d2efab4e3af98c6945b251e6e7e4ff1490 | |
parent | 98ae1e4f07911b264e97b92c69bc5dd0956e0dc5 (diff) | |
download | vcard-nougat-dr1-release.tar.gz |
Fix vcard testsandroid-n-mr1-preview-2android-n-mr1-preview-1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-release
They were broken by Iac18e5015fe78145551d7a60a17446a4a38b3be7.
Bug 26774547
Change-Id: I08ded7e069a28990108b830804894f71a171c081
-rw-r--r-- | tests/AndroidManifest.xml | 8 | ||||
-rw-r--r-- | tests/src/com/android/vcard/tests/VCardTestRunner.java | 46 | ||||
-rw-r--r-- | tests/src/com/android/vcard/tests/testutils/ExportTestProvider.java | 7 |
3 files changed, 10 insertions, 51 deletions
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index 39d516b..f12ed17 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -14,6 +14,10 @@ limitations under the License. --> +<!-- + Run test with: + adb shell am instrument -w com.android.vcard.tests/android.test.InstrumentationTestRunner +--> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.vcard.tests" android:sharedUserId="com.android.uid.test"> @@ -22,10 +26,6 @@ <uses-library android:name="android.test.runner" /> </application> - <instrumentation android:name=".VCardTestRunner" - android:targetPackage="com.android.vcard.tests" - android:label="TestRunner running all Android vCard Library Tests" /> - <instrumentation android:name="android.test.InstrumentationTestRunner" android:targetPackage="com.android.vcard.tests" android:label="TestRunner letting users run each test including new one" /> diff --git a/tests/src/com/android/vcard/tests/VCardTestRunner.java b/tests/src/com/android/vcard/tests/VCardTestRunner.java deleted file mode 100644 index a220a58..0000000 --- a/tests/src/com/android/vcard/tests/VCardTestRunner.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2010 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.vcard.tests; - -import android.test.InstrumentationTestRunner; -import android.test.InstrumentationTestSuite; - -import junit.framework.TestSuite; - -/** - * Usage: adb shell am instrument -w com.android.vcard.tests/.VCardTestRunnerTestRunner - */ -public class VCardTestRunner extends InstrumentationTestRunner { - @Override - public TestSuite getAllTests() { - TestSuite suite = new InstrumentationTestSuite(this); - suite.addTestSuite(VCardBuilderTest.class); - suite.addTestSuite(VCardEntryTests.class); - suite.addTestSuite(VCardParserTests.class); - suite.addTestSuite(VCardUtilsTests.class); - suite.addTestSuite(VCardTestUtilsTests.class); - suite.addTestSuite(VCardImporterTests.class); - suite.addTestSuite(VCardExporterTests.class); - suite.addTestSuite(VCardJapanizationTests.class); - suite.addTestSuite(VCardImporterNestTests.class); - return suite; - } - - @Override - public ClassLoader getLoader() { - return VCardTestRunner.class.getClassLoader(); - } -} diff --git a/tests/src/com/android/vcard/tests/testutils/ExportTestProvider.java b/tests/src/com/android/vcard/tests/testutils/ExportTestProvider.java index 6b5def5..edf02f1 100644 --- a/tests/src/com/android/vcard/tests/testutils/ExportTestProvider.java +++ b/tests/src/com/android/vcard/tests/testutils/ExportTestProvider.java @@ -155,7 +155,7 @@ public class ExportTestProvider extends MockContentProvider { @Override public int getColumnIndex(String columnName) { - TestCase.assertEquals(Contacts._ID, columnName); + TestCase.assertEquals(Data.CONTACT_ID, columnName); return 0; } @@ -168,6 +168,11 @@ public class ExportTestProvider extends MockContentProvider { } @Override + public long getLong(int columnIndex) { + return getInt(columnIndex); + } + + @Override public String getString(int columnIndex) { return String.valueOf(getInt(columnIndex)); } |