Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8dbbc354 authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Turn on DepAnn for test-base and test-runner"

parents 1ea3d941 2d86c7a4

test-base/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ java_library { 


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



    errorprone: {

      javacflags: ["-Xep:DepAnn:ERROR"],

    },



    // Needs to be consistent with the repackaged version of this make target.

    java_version: "1.8",

test-base/src/android/test/PerformanceTestCase.java

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ package android.test; 
 *

 * If you want your test to be used as a performance test, you must

 * implement this interface.

 *

 * @deprecated Use

 * <a href="{@docRoot}reference/android/support/test/runner/AndroidJUnitRunner.html">

 * AndroidJUnitRunner</a> instead. New tests should be written using the

 * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.

 */

@Deprecated

public interface PerformanceTestCase

test-runner/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ java_library { 
    java_version: "1.8",

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



    errorprone: {

      javacflags: ["-Xep:DepAnn:ERROR"],

    },



    no_framework_libs: true,

    libs: [

        "framework",

test-runner/src/android/test/ComparisonFailure.java

+2 −1
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ package android.test; 
/**

 * Thrown when an assert equals for Strings failed.

 * 

 * @deprecated use junit.framework.ComparisonFailure

 * @deprecated use org.junit.ComparisonFailure

 */

@Deprecated

public class ComparisonFailure extends AssertionFailedError {

    private junit.framework.ComparisonFailure mComparison;

test-runner/src/android/test/TestSuiteProvider.java

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ import junit.framework.TestSuite; 


/**

 * Implementors will know how to get a test suite.

 *

 * @deprecated Use

 * <a href="{@docRoot}reference/android/support/test/runner/AndroidJUnitRunner.html">

 * AndroidJUnitRunner</a> instead. New tests should be written using the

 * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.

 */

@Deprecated

public interface TestSuiteProvider {