Merge "Fix Error Prone errors" (3a9f1e91) · 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);

+4 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ import com.android.server.backup.utils.RandomAccessFileUtils;

		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;
		@@ -513,6 +514,8 @@ public class BackupManagerServiceTest {
		verifyNoMoreInteractions(mUserBackupManagerService);
		}

		@Test
		@Ignore("b/147012496")
		public void testGetUserForAncestralSerialNumber() {
		BackupManagerServiceTestable.sBackupDisabled = false;
		BackupManagerService backupManagerService =
		@@ -524,6 +527,7 @@ public class BackupManagerServiceTest {
		assertThat(user).isEqualTo(UserHandle.of(1));
		}

		@Test
		public void testGetUserForAncestralSerialNumber_whenDisabled() {
		BackupManagerServiceTestable.sBackupDisabled = true;
		BackupManagerService backupManagerService =

+1 −0

Original line number	Diff line number	Diff line
		@@ -136,6 +136,7 @@ public class DataChangedJournalTest {
		assertThat(mJournal.toString()).isEqualTo(mFile.toString());
		}

		@Test
		public void listJournals_invalidJournalFile_returnsEmptyList() throws Exception {
		when(invalidFile.listFiles()).thenReturn(null);

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