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

Commit 3ca7fb42 authored by Colin Cross's avatar Colin Cross Committed by Lorenzo Colitti
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:
packages/modules/NetworkStack/tests/integration/src/android/net/ip/IpClientIntegrationTest.java:1182: 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.
packages/modules/NetworkStack/tests/unit/src/android/net/ip/IpClientTest.java:352: 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.
packages/modules/NetworkStack/tests/unit/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java:772: 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: Iec6c4d9e4cde39f98068b3351a1d828e45abf54b
parent d035d367

tests/integration/src/android/net/ip/IpClientIntegrationTest.java

+1 −0
Original line number Diff line number Diff line
@@ -1179,6 +1179,7 @@ public class IpClientIntegrationTest { 
                true /* shouldAbortPreconnection */);

    }



    @Test

    public void testDhcpDecline_conflictByArpReply() throws Exception {

        doIpAddressConflictDetectionTest(true /* causeIpAddressConflict */,

                false /* isDhcpRapidCommitEnabled */, true /* isDhcpIpConflictDetectEnabled */,

tests/unit/src/android/net/ip/IpClientTest.java

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ public class IpClientTest { 
        doDefaultDualStackProvisioningConfigurationTest(false /* avoidBadWifi */);

    }



    @Test

    public void testProvisioningWithInitialConfiguration() throws Exception {

        final String iface = TEST_IFNAME;

        final IpClient ipc = makeIpClient(iface);

tests/unit/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreServiceTest.java

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import libcore.io.Streams; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -769,6 +770,8 @@ public class IpMemoryStoreServiceTest { 
                        })));

    }



    @Test

    @Ignore

    public void testTasksAreSerial() {

        final long sleepTimeMs = 1000;

        final long startTime = System.currentTimeMillis();