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

Commit 1f4620ac authored by Colin Cross's avatar Colin Cross
Browse files

Fix Error Prone errors 

Soong wasn't including android_app or android_test sources in the
javac-check target used for the Error Prone build, which allowed
some Error Prone errors to get in.  Fix them so Error Prone can be
re-enabled for these targets.

Fixes:
frameworks/base/core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java:241: error: [JUnit4TestNotRun] This looks like a test method but is not run; please add @Test and @Ignore, or, if this is a helper method, reduce its visibility.
frameworks/base/core/tests/systemproperties/src/android/os/SystemPropertiesTest.java:97: error: [JUnit3TestNotRun] Test method will not be run; please correct method signature (Should be public, non-static, and method name should begin with "test").
frameworks/base/services/tests/servicestests/src/com/android/server/backup/utils/FileUtilsTest.java:64: error: [CheckReturnValue] Ignored return value of method that is annotated with @CheckReturnValue
frameworks/base/services/tests/servicestests/src/com/android/server/backup/utils/FileUtilsTest.java:68: error: [CheckReturnValue] Ignored return value of method that is annotated with @CheckReturnValue
frameworks/base/services/tests/servicestests/src/com/android/server/backup/utils/FileUtilsTest.java:78: error: [CheckReturnValue] Ignored return value of method that is annotated with @CheckReturnValue
frameworks/base/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystemTest.java:533: error: [JUnit4TestNotRun] This looks like a test method but is not run; please add @Test and @Ignore, or, if this is a helper method, reduce its visibility.
frameworks/base/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsStorageTests.java:480: error: [JUnit4TestNotRun] This looks like a test method but is not run; please add @Test and @Ignore, or, if this is a helper method, reduce its visibility.
frameworks/base/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsStorageTests.java:491: error: [JUnit4TestNotRun] This looks like a test method but is not run; please add @Test and @Ignore, or, if this is a helper method, reduce its visibility.
frameworks/base/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java:4196: error: [JUnit4TestNotRun] This looks like a test method but is not run; please add @Test and @Ignore, or, if this is a helper method, reduce its visibility.

Bug: 146455923
Test: m RUN_ERROR_PRONE=true javac-check
Change-Id: I829373d41c97962fe2122ea74cef12ba342ac33c
Merged-In: I829373d41c97962fe2122ea74cef12ba342ac33c
parent 53484a49

core/tests/coretests/src/android/view/textclassifier/ActionsSuggestionsHelperTest.java

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ public class ActionsSuggestionsHelperTest { 
        assertThat(conversationActions).isEmpty();

    }



    @Test

    public void createLabeledIntentResult_null() {

        ActionsSuggestionsModel.ActionSuggestion nativeSuggestion =

                new ActionsSuggestionsModel.ActionSuggestion(

core/tests/systemproperties/src/android/os/SystemPropertiesTest.java

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ public class SystemPropertiesTest extends TestCase { 
    }



    @SmallTest

    private static void testHandle() throws Exception {

    public void testHandle() throws Exception {

        String value;

        SystemProperties.Handle handle = SystemProperties.find("doesnotexist_2341431");

        assertNull(handle);

services/tests/servicestests/src/com/android/server/backup/utils/FileUtilsTest.java

+7 −9
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.google.common.io.Files; 


import org.junit.AfterClass;

import org.junit.Before;

import org.junit.BeforeClass;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -41,11 +40,6 @@ public class FileUtilsTest { 
    private static File sTemporaryDir;

    private File mTemporaryFile;



    @BeforeClass

    public static void setUpClass() {

        sTemporaryDir = Files.createTempDir();

    }



    @AfterClass

    public static void tearDownClass() {

        if (sTemporaryDir != null) {
@@ -55,17 +49,21 @@ public class FileUtilsTest { 


    @Before

    public void setUp() throws Exception {

        if (sTemporaryDir != null) {

            sTemporaryDir.delete();

        }

        sTemporaryDir = Files.createTempDir();

        mTemporaryFile = new File(sTemporaryDir, "fileutilstest.txt");

    }



    /** Test that if file does not exist, {@link FileUtils#createNewFile()} creates the file. */

    @Test

    public void testEnsureFileExists_fileDoesNotAlreadyExist_getsCreated() {

        assertThat(!mTemporaryFile.exists());

        assertThat(mTemporaryFile.exists()).isFalse();



        FileUtils.createNewFile(mTemporaryFile);



        assertThat(mTemporaryFile.exists());

        assertThat(mTemporaryFile.exists()).isTrue();

    }



    /** Test that if file does exist, {@link FileUtils#createNewFile()} does not error out. */
@@ -75,6 +73,6 @@ public class FileUtilsTest { 


        FileUtils.createNewFile(mTemporaryFile);



        assertThat(mTemporaryFile.exists());

        assertThat(mTemporaryFile.exists()).isTrue();

    }

}

services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystemTest.java

+1 −0
Original line number Diff line number Diff line
@@ -530,6 +530,7 @@ public class HdmiCecLocalDeviceAudioSystemTest { 
        assertThat(mNativeWrapper.getOnlyResultMessage()).isEqualTo(expectedMessage);

    }



    @Test

    public void handleSystemAudioModeRequest_fromNonTV_tVNotSupport() {

        HdmiCecMessage message =

                HdmiCecMessageBuilder.buildSystemAudioModeRequest(

services/tests/servicestests/src/com/android/server/locksettings/LockSettingsStorageTests.java

+2 −0
Original line number Diff line number Diff line
@@ -477,6 +477,7 @@ public class LockSettingsStorageTests { 
        assertEquals(2, PersistentData.TYPE_SP_WEAVER);

    }



    @Test

    public void testCredentialHash_serializeUnserialize() {

        byte[] serialized = CredentialHash.create(

                PAYLOAD, LockPatternUtils.CREDENTIAL_TYPE_PASSWORD).toBytes();
@@ -488,6 +489,7 @@ public class LockSettingsStorageTests { 
        assertFalse(deserialized.isBaseZeroPattern);

    }



    @Test

    public void testCredentialHash_unserialize_versionGatekeeper() {

        // This test ensures that we can read serialized VERSION_GATEKEEPER CredentialHashes

        // even if we change the wire format in the future.