From 46a435a37800f3d5d3d4768ff92fd74b2ae55148 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 29 Aug 2017 12:18:55 -0700 Subject: [PATCH] Fix errorprone build Fixes: frameworks/base/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java:149: error: [JUnit4TestNotRun] Test method will not be run; please add @Test annotation public void testNoSettingsValueDefaultDisabledDoesNotStart() throws Exception { ^ (see http://errorprone.info/bugpattern/JUnit4TestNotRun) Did you mean '@Test'? frameworks/base/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java:170: error: [JUnit4TestNotRun] Test method will not be run; please add @Test annotation public void testNoSettingsValueDefaultEnabledDoesStart() throws Exception { ^ (see http://errorprone.info/bugpattern/JUnit4TestNotRun) Did you mean '@Test'? Bug: 64489631 Test: m -j RUN_ERROR_PRONE=true javac-check Merged-In: Ib32489d07778465134bca52c589baddbd78ab129 Change-Id: I41dfdf87529e532df385617fa05c7006a7a14c86 --- .../connectivity/tethering/OffloadControllerTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java b/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java index d7739518ef2db..27e90bcf98bed 100644 --- a/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java +++ b/tests/net/java/com/android/server/connectivity/tethering/OffloadControllerTest.java @@ -68,6 +68,7 @@ import java.util.Set; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.runner.RunWith; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -144,8 +145,8 @@ public class OffloadControllerTest { return offload; } - // TODO: Restore when FakeSettingsProvider.clearSettingsProvider() is available. - // @Test + @Test + @Ignore("Restore when FakeSettingsProvider.clearSettingsProvider() is available.") public void testNoSettingsValueDefaultDisabledDoesNotStart() throws Exception { setupFunctioningHardwareInterface(); when(mHardware.getDefaultTetherOffloadDisabled()).thenReturn(1); @@ -165,8 +166,8 @@ public class OffloadControllerTest { inOrder.verifyNoMoreInteractions(); } - // TODO: Restore when FakeSettingsProvider.clearSettingsProvider() is available. - // @Test + @Test + @Ignore("Restore when FakeSettingsProvider.clearSettingsProvider() is available.") public void testNoSettingsValueDefaultEnabledDoesStart() throws Exception { setupFunctioningHardwareInterface(); when(mHardware.getDefaultTetherOffloadDisabled()).thenReturn(0);