Browse Source

Merge "Switch android.test and junit classes to use UnsupportedAppUsage" am: 7bb0bcd305 am: b5ccf0e21c

am: d75f1793e6

Change-Id: I7a7c34980507393ec855c9e161ca0a922ed57fe4
ten
Paul Duffin 2 years ago
parent
commit
ae3b4c44fb

+ 0
- 6
config/hiddenapi-greylist.txt View File

@@ -1361,9 +1361,6 @@ Landroid/telephony/SmsCbMessage;->getServiceCategory()I
Landroid/telephony/SmsCbMessage;->isCmasMessage()Z
Landroid/telephony/SmsCbMessage;->isEmergencyMessage()Z
Landroid/telephony/TelephonyManager$MultiSimVariants;->values()[Landroid/telephony/TelephonyManager$MultiSimVariants;
Landroid/test/AndroidTestCase;->getTestContext()Landroid/content/Context;
Landroid/test/AndroidTestCase;->setTestContext(Landroid/content/Context;)V
Landroid/test/InstrumentationTestCase;->runMethod(Ljava/lang/reflect/Method;I)V
Landroid/util/Singleton;-><init>()V
Landroid/util/XmlPullAttributes;-><init>(Lorg/xmlpull/v1/XmlPullParser;)V
Landroid/util/XmlPullAttributes;->mParser:Lorg/xmlpull/v1/XmlPullParser;
@@ -4176,9 +4173,6 @@ Lgov/nist/javax/sip/address/SipUri;->setParameter(Ljava/lang/String;Ljava/lang/S
Lgov/nist/javax/sip/address/SipUri;->setUserParam(Ljava/lang/String;)V
Lgov/nist/javax/sip/parser/URLParser;-><init>(Ljava/lang/String;)V
Lgov/nist/javax/sip/parser/URLParser;->sipURL(Z)Lgov/nist/javax/sip/address/SipUri;
Ljunit/framework/TestCase;->fName:Ljava/lang/String;
Ljunit/framework/TestSuite;->isPublicTestMethod(Ljava/lang/reflect/Method;)Z
Ljunit/framework/TestSuite;->isTestMethod(Ljava/lang/reflect/Method;)Z
Lorg/apache/xalan/extensions/ExpressionContext;->getContextNode()Lorg/w3c/dom/Node;
Lorg/apache/xalan/extensions/ExpressionContext;->getErrorListener()Ljavax/xml/transform/ErrorListener;
Lorg/apache/xalan/extensions/ExpressionContext;->getVariableOrParam(Lorg/apache/xml/utils/QName;)Lorg/apache/xpath/objects/XObject;

+ 29
- 0
test-base/hiddenapi/Android.bp View File

@@ -0,0 +1,29 @@
//
// 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.
//

// Provided solely to contribute information about which hidden parts of the android.test.base
// library are used by apps. The source files are stubs of the actual files in ../src which use the
// UnsupportedAppUsage annotation to tag those methods that are accessible via the hiddenapi.
// Relies on the convention that modules with name <x>-hiddenapi provide hiddenapi information for
// module <x> that is on the bootclasspath.
java_library {
name: "android.test.base-hiddenapi",
compile_dex: true,

srcs: ["src/**/*.java"],

libs: ["android.test.base"],
}

+ 46
- 0
test-base/hiddenapi/src/android/test/AndroidTestCase.java View File

@@ -0,0 +1,46 @@
/*
* 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.test;

import android.annotation.UnsupportedAppUsage;
import android.content.Context;

import junit.framework.TestCase;

/**
* @deprecated Stub only
*/
@SuppressWarnings({ "unchecked", "deprecation", "all" })
@Deprecated
public class AndroidTestCase extends TestCase {

/**
* Stub only
*/
@UnsupportedAppUsage
public void setTestContext(Context context) {
throw new RuntimeException("Stub!");
}

/**
* Stub only
*/
@UnsupportedAppUsage
public Context getTestContext() {
throw new RuntimeException("Stub!");
}
}

+ 39
- 0
test-base/hiddenapi/src/android/test/InstrumentationTestCase.java View File

@@ -0,0 +1,39 @@
/*
* 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.test;

import android.annotation.UnsupportedAppUsage;

import junit.framework.TestCase;

import java.lang.reflect.Method;

/**
* @deprecated Stub only
*/
@SuppressWarnings({ "unchecked", "deprecation", "all" })
@Deprecated
public class InstrumentationTestCase extends TestCase {

/**
* Stub only
*/
@UnsupportedAppUsage
private void runMethod(Method runMethod, int tolerance) throws Throwable {
throw new RuntimeException("Stub!");
}
}

+ 46
- 0
test-base/hiddenapi/src/junit/framework/TestCase.java View File

@@ -0,0 +1,46 @@
/*
* 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 junit.framework;

import android.annotation.UnsupportedAppUsage;

/**
* Stub only
*/
@SuppressWarnings({ "unchecked", "deprecation", "all" })
public abstract class TestCase extends Assert implements Test {

/**
* the name of the test case
*/
@UnsupportedAppUsage
private String fName;

/**
* Stub only
*/
public int countTestCases() {
throw new RuntimeException("Stub!");
}

/**
* Stub only
*/
public void run(TestResult result) {
throw new RuntimeException("Stub!");
}
}

+ 58
- 0
test-base/hiddenapi/src/junit/framework/TestSuite.java View File

@@ -0,0 +1,58 @@
/*
* 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 junit.framework;

import android.annotation.UnsupportedAppUsage;

import java.lang.reflect.Method;

/**
* Stub only
*/
@SuppressWarnings({ "unchecked", "deprecation", "all" })
public class TestSuite implements Test {

/**
* Stub only
*/
@UnsupportedAppUsage
private boolean isPublicTestMethod(Method m) {
throw new RuntimeException("Stub!");
}

/**
* Stub only
*/
@UnsupportedAppUsage
private boolean isTestMethod(Method m) {
throw new RuntimeException("Stub!");
}

/**
* Stub only
*/
public int countTestCases() {
throw new RuntimeException("Stub!");
}

/**
* Stub only
*/
public void run(TestResult result) {
throw new RuntimeException("Stub!");
}
}

+ 2
- 0
tools/hiddenapi/exclude.sh View File

@@ -9,6 +9,7 @@ LOCAL_DIR="$( dirname ${BASH_SOURCE} )"
LIBCORE_PACKAGES="\
android.icu \
android.system \
android.test \
com.android.bouncycastle \
com.android.conscrypt \
com.android.i18n.phonenumbers \
@@ -17,6 +18,7 @@ LIBCORE_PACKAGES="\
dalvik \
java \
javax \
junit \
libcore \
org.apache.harmony \
org.json \

Loading…
Cancel
Save