Merge "Fix broken archive tests." (c8659387) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/archives/Archive.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ public class Archive implements Closeable {
		mArchiveUri = archiveUri;
		mNotificationUri = notificationUri;
		mZipFile = file != null ?
		new StrictJarFile(file.getName(), false /* verify /, false / signatures */) :
		new StrictJarFile(file.getPath(), false /* verify /, false / signatures */) :
		new StrictJarFile(fd, false /* verify /, false / signatures */);
		mExecutor = Executors.newSingleThreadExecutor();

		@@ -236,9 +236,9 @@ public class Archive implements Closeable {
		outputStream.write(buffer, 0, bytes);
		}
		outputStream.flush();
		}
		return new Archive(context, snapshotFile, null, archiveUri,
		notificationUri);
		}
		} finally {
		// On UNIX the file will be still available for processes which opened it, even
		// after deleting it. Remove it ASAP, as it won't be used by anyone else.

tests/unit/com/android/documentsui/archives/ArchiveTest.java

+11 −11

Original line number	Diff line number	Diff line
		@@ -157,20 +157,20 @@ public class ArchiveTest extends AndroidTestCase {
		new ArchiveId(ARCHIVE_URI, "/").toDocumentId(), null, null);

		assertTrue(cursor.moveToFirst());
		assertEquals(new ArchiveId(ARCHIVE_URI, "/dir1/").toDocumentId(),
		assertEquals(
		new ArchiveId(ARCHIVE_URI, "/file1.txt").toDocumentId(),
		cursor.getString(cursor.getColumnIndexOrThrow(Document.COLUMN_DOCUMENT_ID)));
		assertEquals("dir1",
		assertEquals("file1.txt",
		cursor.getString(cursor.getColumnIndexOrThrow(Document.COLUMN_DISPLAY_NAME)));
		assertEquals(Document.MIME_TYPE_DIR,
		assertEquals("text/plain",
		cursor.getString(cursor.getColumnIndexOrThrow(Document.COLUMN_MIME_TYPE)));
		assertEquals(0,
		assertEquals(13,
		cursor.getInt(cursor.getColumnIndexOrThrow(Document.COLUMN_SIZE)));

		assertTrue(cursor.moveToNext());
		assertEquals(
		new ArchiveId(ARCHIVE_URI, "/dir2/").toDocumentId(),
		assertEquals(new ArchiveId(ARCHIVE_URI, "/dir1/").toDocumentId(),
		cursor.getString(cursor.getColumnIndexOrThrow(Document.COLUMN_DOCUMENT_ID)));
		assertEquals("dir2",
		assertEquals("dir1",
		cursor.getString(cursor.getColumnIndexOrThrow(Document.COLUMN_DISPLAY_NAME)));
		assertEquals(Document.MIME_TYPE_DIR,
		cursor.getString(cursor.getColumnIndexOrThrow(Document.COLUMN_MIME_TYPE)));
		@@ -179,13 +179,13 @@ public class ArchiveTest extends AndroidTestCase {

		assertTrue(cursor.moveToNext());
		assertEquals(
		new ArchiveId(ARCHIVE_URI, "/file1.txt").toDocumentId(),
		new ArchiveId(ARCHIVE_URI, "/dir2/").toDocumentId(),
		cursor.getString(cursor.getColumnIndexOrThrow(Document.COLUMN_DOCUMENT_ID)));
		assertEquals("file1.txt",
		assertEquals("dir2",
		cursor.getString(cursor.getColumnIndexOrThrow(Document.COLUMN_DISPLAY_NAME)));
		assertEquals("text/plain",
		assertEquals(Document.MIME_TYPE_DIR,
		cursor.getString(cursor.getColumnIndexOrThrow(Document.COLUMN_MIME_TYPE)));
		assertEquals(13,
		assertEquals(0,
		cursor.getInt(cursor.getColumnIndexOrThrow(Document.COLUMN_SIZE)));

		assertFalse(cursor.moveToNext());