Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Migrate sdkext tests to CTS"

Browse Source 
am: 3f19841dc2

Change-Id: I4149ff9262fabc74bbd96f483cc11a453e869cb2
This commit is contained in:
Anton Hansson
2019-12-10 10:47:09 -08:00
committed by android-build-merger
parent df60db0de6 3f19841dc2
commit 2ed810a56a
4 changed files with 1 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/sdkext/TEST_MAPPING
View File

@@ -1,7 +1,7 @@
{
"presubmit": [
{
"name": "framework-sdkext-tests"
"name": "CtsSdkExtTestCases"
}
]
}

11
apex/sdkext/framework/tests/Android.bp
View File

@@ -1,11 +0,0 @@
android_test {
name: "framework-sdkext-tests",
srcs: ["src/**/*.java"],
libs: [
"android.test.base",
"android.test.runner",
],
static_libs: [ "framework-sdkext" ],
test_suites: [ "general-tests" ],
platform_apis: true,
}

27
apex/sdkext/framework/tests/AndroidManifest.xml
View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2019 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.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.sdkext.tests">
<application>
<uses-library android:name="android.test.runner" />
</application>
<instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="com.android.sdkext.tests" />
</manifest>

40
apex/sdkext/framework/tests/src/android/os/ext/SdkExtensionsTest.java
View File

@@ -1,40 +0,0 @@
/*
* Copyright (C) 2019 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 android.os.ext;
import android.os.Build;
import android.test.suitebuilder.annotation.SmallTest;
import junit.framework.TestCase;
public class SdkExtensionsTest extends TestCase {
@SmallTest
public void testBadArgument() throws Exception {
try {
SdkExtensions.getExtensionVersion(Build.VERSION_CODES.Q);
fail("expected IllegalArgumentException");
} catch (IllegalArgumentException expected) { }
}
@SmallTest
public void testDefault() throws Exception {
int r = SdkExtensions.getExtensionVersion(Build.VERSION_CODES.R);
assertTrue(r >= 0);
}
}