Merge "Fix Error Prone errors" (645ae56f) · Commits · e / os / android_frameworks_base

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(

+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);

+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();
		}
		}

+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(

+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.