Commit a32dfdce authored Dec 19, 2019 by Colin Cross

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/apps/Bluetooth/tests/unit/src/com/android/bluetooth/StateMachineTest.java:1037: 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/apps/Bluetooth/tests/unit/src/com/android/bluetooth/StateMachineTest.java:1332: 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/apps/Bluetooth/tests/unit/src/com/android/bluetooth/StateMachineTest.java:1457: 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/apps/Bluetooth/tests/unit/src/com/android/bluetooth/StateMachineTest.java:1564: 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/apps/Bluetooth/tests/unit/src/com/android/bluetooth/StateMachineTest.java:1716: 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/apps/Bluetooth/tests/unit/src/com/android/bluetooth/StateMachineTest.java:1918: 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/apps/Bluetooth/tests/unit/src/com/android/bluetooth/StateMachineTest.java:740: 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/apps/Bluetooth/tests/unit/src/com/android/bluetooth/StateMachineTest.java:847: 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/apps/Bluetooth/tests/unit/src/com/android/bluetooth/StateMachineTest.java:941: 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: I8ef74b286139b86bf5af6e5d25fc75e42ca8ef63

parent 9d09f63c

tests/unit/src/com/android/bluetooth/StateMachineTest.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -736,7 +736,7 @@ public class StateMachineTest {
		private int mExitCount;
		}

		@MediumTest
		@Test @MediumTest
		public void testStateMachine1() throws Exception {
		StateMachine1 sm1 = new StateMachine1("sm1");
		sm1.start();
		@@ -843,7 +843,7 @@ public class StateMachineTest {
		private boolean mDidExit = false;
		}

		@MediumTest
		@Test @MediumTest
		public void testStateMachine2() throws Exception {
		StateMachine2 sm2 = new StateMachine2("sm2");
		sm2.start();
		@@ -937,7 +937,7 @@ public class StateMachineTest {
		private ChildState mChildState = new ChildState();
		}

		@MediumTest
		@Test @MediumTest
		public void testStateMachine3() throws Exception {
		StateMachine3 sm3 = new StateMachine3("sm3");
		sm3.start();
		@@ -1033,7 +1033,7 @@ public class StateMachineTest {
		private ChildState2 mChildState2 = new ChildState2();
		}

		@MediumTest
		@Test @MediumTest
		public void testStateMachine4() throws Exception {
		StateMachine4 sm4 = new StateMachine4("sm4");
		sm4.start();
		@@ -1328,7 +1328,7 @@ public class StateMachineTest {
		private int mChildState5ExitCount = 0;
		}

		@MediumTest
		@Test @MediumTest
		public void testStateMachine5() throws Exception {
		StateMachine5 sm5 = new StateMachine5("sm5");
		sm5.start();
		@@ -1453,7 +1453,7 @@ public class StateMachineTest {
		private long mArrivalTimeMsg2;
		}

		@MediumTest
		@Test @MediumTest
		public void testStateMachine6() throws Exception {
		final int DELAY_TIME = 250;
		final int DELAY_FUDGE = 20;
		@@ -1560,7 +1560,7 @@ public class StateMachineTest {
		private long mArrivalTimeMsg3;
		}

		@MediumTest
		@Test @MediumTest
		public void testStateMachine7() throws Exception {
		final int SM7_DELAY_FUDGE = 20;

		@@ -1712,7 +1712,7 @@ public class StateMachineTest {
		private static int sharedCounter = 0;
		private static Object waitObject = new Object();

		@MediumTest
		@Test @MediumTest
		public void testStateMachineSharedThread() throws Exception {
		if (DBG) tlog("testStateMachineSharedThread E");

		@@ -1914,7 +1914,7 @@ public class StateMachineTest {
		P2 mP2 = new P2();
		}

		@MediumTest
		@Test @MediumTest
		public void testHsm1() throws Exception {
		if (DBG) tlog("testHsm1 E");