am 963cd006: Allow creating AssetFileDescriptors for MemoryFiles.
Merge commit '963cd006c45716b034f656bf7e7179e6476f7e4d' * commit '963cd006c45716b034f656bf7e7179e6476f7e4d': Allow creating AssetFileDescriptors for MemoryFiles.
This commit is contained in:
Bjorn Bringert
committed by
The Android Open Source Project
The Android Open Source Project
commit
c0cbfda0fe
@@ -0,0 +1,211 @@
|
||||
/*
|
||||
* Copyright (C) 2009 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.unit_tests.content;
|
||||
|
||||
import android.content.ContentProvider;
|
||||
import android.content.ContentValues;
|
||||
import android.content.Context;
|
||||
import android.content.UriMatcher;
|
||||
import android.content.res.AssetFileDescriptor;
|
||||
import android.database.Cursor;
|
||||
import android.database.sqlite.SQLiteDatabase;
|
||||
import android.database.sqlite.SQLiteOpenHelper;
|
||||
import android.net.Uri;
|
||||
import android.os.MemoryFile;
|
||||
import android.os.ParcelFileDescriptor;
|
||||
import android.util.Log;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
|
||||
/** Simple test provider that runs in the local process. */
|
||||
public class MemoryFileProvider extends ContentProvider {
|
||||
private static final String TAG = "MemoryFileProvider";
|
||||
|
||||
private static final String DATA_FILE = "data.bin";
|
||||
|
||||
// some random data
|
||||
public static final byte[] TEST_BLOB = new byte[] {
|
||||
-12, 127, 0, 3, 1, 2, 3, 4, 5, 6, 1, -128, -1, -54, -65, 35,
|
||||
-53, -96, -74, -74, -55, -43, -69, 3, 52, -58,
|
||||
-121, 127, 87, -73, 16, -13, -103, -65, -128, -36,
|
||||
107, 24, 118, -17, 97, 97, -88, 19, -94, -54,
|
||||
53, 43, 44, -27, -124, 28, -74, 26, 35, -36,
|
||||
16, -124, -31, -31, -128, -79, 108, 116, 43, -17 };
|
||||
|
||||
private SQLiteOpenHelper mOpenHelper;
|
||||
|
||||
private static final int DATA_ID_BLOB = 1;
|
||||
private static final int HUGE = 2;
|
||||
private static final int FILE = 3;
|
||||
|
||||
private static final UriMatcher sURLMatcher = new UriMatcher(
|
||||
UriMatcher.NO_MATCH);
|
||||
|
||||
static {
|
||||
sURLMatcher.addURI("*", "data/#/blob", DATA_ID_BLOB);
|
||||
sURLMatcher.addURI("*", "huge", HUGE);
|
||||
sURLMatcher.addURI("*", "file", FILE);
|
||||
}
|
||||
|
||||
private static class DatabaseHelper extends SQLiteOpenHelper {
|
||||
private static final String DATABASE_NAME = "local.db";
|
||||
private static final int DATABASE_VERSION = 1;
|
||||
|
||||
public DatabaseHelper(Context context) {
|
||||
super(context, DATABASE_NAME, null, DATABASE_VERSION);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(SQLiteDatabase db) {
|
||||
db.execSQL("CREATE TABLE data (" +
|
||||
"_id INTEGER PRIMARY KEY," +
|
||||
"_blob TEXT, " +
|
||||
"integer INTEGER);");
|
||||
|
||||
// insert alarms
|
||||
ContentValues values = new ContentValues();
|
||||
values.put("_id", 1);
|
||||
values.put("_blob", TEST_BLOB);
|
||||
values.put("integer", 100);
|
||||
db.insert("data", null, values);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onUpgrade(SQLiteDatabase db, int oldVersion, int currentVersion) {
|
||||
Log.w(TAG, "Upgrading test database from version " +
|
||||
oldVersion + " to " + currentVersion +
|
||||
", which will destroy all old data");
|
||||
db.execSQL("DROP TABLE IF EXISTS data");
|
||||
onCreate(db);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public MemoryFileProvider() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCreate() {
|
||||
mOpenHelper = new DatabaseHelper(getContext());
|
||||
try {
|
||||
OutputStream out = getContext().openFileOutput(DATA_FILE, Context.MODE_PRIVATE);
|
||||
out.write(TEST_BLOB);
|
||||
out.close();
|
||||
} catch (IOException ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Cursor query(Uri url, String[] projectionIn, String selection,
|
||||
String[] selectionArgs, String sort) {
|
||||
throw new UnsupportedOperationException("query not supported");
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getType(Uri url) {
|
||||
int match = sURLMatcher.match(url);
|
||||
switch (match) {
|
||||
case DATA_ID_BLOB:
|
||||
return "application/octet-stream";
|
||||
case FILE:
|
||||
return "application/octet-stream";
|
||||
default:
|
||||
throw new IllegalArgumentException("Unknown URL");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public AssetFileDescriptor openAssetFile(Uri url, String mode) throws FileNotFoundException {
|
||||
int match = sURLMatcher.match(url);
|
||||
switch (match) {
|
||||
case DATA_ID_BLOB:
|
||||
String sql = "SELECT _blob FROM data WHERE _id=" + url.getPathSegments().get(1);
|
||||
return getBlobColumnAsAssetFile(url, mode, sql);
|
||||
case HUGE:
|
||||
try {
|
||||
MemoryFile memoryFile = new MemoryFile(null, 5000000);
|
||||
memoryFile.writeBytes(TEST_BLOB, 0, 1000000, TEST_BLOB.length);
|
||||
memoryFile.deactivate();
|
||||
return AssetFileDescriptor.fromMemoryFile(memoryFile);
|
||||
} catch (IOException ex) {
|
||||
throw new FileNotFoundException("Error reading " + url + ":" + ex.toString());
|
||||
}
|
||||
case FILE:
|
||||
File file = getContext().getFileStreamPath(DATA_FILE);
|
||||
ParcelFileDescriptor fd =
|
||||
ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
|
||||
return new AssetFileDescriptor(fd, 0, AssetFileDescriptor.UNKNOWN_LENGTH);
|
||||
default:
|
||||
throw new FileNotFoundException("No files supported by provider at " + url);
|
||||
}
|
||||
}
|
||||
|
||||
private AssetFileDescriptor getBlobColumnAsAssetFile(Uri url, String mode, String sql)
|
||||
throws FileNotFoundException {
|
||||
if (!"r".equals(mode)) {
|
||||
throw new FileNotFoundException("Mode " + mode + " not supported for " + url);
|
||||
}
|
||||
try {
|
||||
SQLiteDatabase db = mOpenHelper.getReadableDatabase();
|
||||
MemoryFile file = simpleQueryForBlobMemoryFile(db, sql);
|
||||
if (file == null) throw new FileNotFoundException("No such entry: " + url);
|
||||
AssetFileDescriptor afd = AssetFileDescriptor.fromMemoryFile(file);
|
||||
file.deactivate();
|
||||
// need to dup and then close? openFileHelper() doesn't do that though
|
||||
return afd;
|
||||
} catch (IOException ex) {
|
||||
throw new FileNotFoundException("Error reading " + url + ":" + ex.toString());
|
||||
}
|
||||
}
|
||||
|
||||
private MemoryFile simpleQueryForBlobMemoryFile(SQLiteDatabase db, String sql) throws IOException {
|
||||
Cursor cursor = db.rawQuery(sql, null);
|
||||
try {
|
||||
if (!cursor.moveToFirst()) {
|
||||
return null;
|
||||
}
|
||||
byte[] bytes = cursor.getBlob(0);
|
||||
MemoryFile file = new MemoryFile(null, bytes.length);
|
||||
file.writeBytes(bytes, 0, 0, bytes.length);
|
||||
return file;
|
||||
} finally {
|
||||
if (cursor != null) {
|
||||
cursor.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int update(Uri url, ContentValues values, String where, String[] whereArgs) {
|
||||
throw new UnsupportedOperationException("update not supported");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Uri insert(Uri url, ContentValues initialValues) {
|
||||
throw new UnsupportedOperationException("insert not supported");
|
||||
}
|
||||
|
||||
@Override
|
||||
public int delete(Uri url, String where, String[] whereArgs) {
|
||||
throw new UnsupportedOperationException("delete not supported");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
/*
|
||||
* Copyright (C) 2009 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.unit_tests.content;
|
||||
|
||||
import android.content.ContentResolver;
|
||||
import android.net.Uri;
|
||||
import android.test.AndroidTestCase;
|
||||
import android.test.suitebuilder.annotation.MediumTest;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* Tests reading a MemoryFile-based AssestFile from a ContentProvider running
|
||||
* in a different process.
|
||||
*/
|
||||
public class MemoryFileProviderTest extends AndroidTestCase {
|
||||
|
||||
// reads from a cross-process AssetFileDescriptor for a MemoryFile
|
||||
@MediumTest
|
||||
public void testRead() throws Exception {
|
||||
ContentResolver resolver = getContext().getContentResolver();
|
||||
Uri uri = Uri.parse("content://com.android.unit_tests.content.MemoryFileProvider/data/1/blob");
|
||||
byte[] buf = new byte[MemoryFileProvider.TEST_BLOB.length];
|
||||
InputStream in = resolver.openInputStream(uri);
|
||||
assertNotNull(in);
|
||||
int count = in.read(buf);
|
||||
assertEquals(buf.length, count);
|
||||
// TODO: MemoryFile throws IndexOutOfBoundsException for this, http://b/issue?id=1881894
|
||||
//assertEquals(-1, in.read());
|
||||
in.close();
|
||||
assertTrue(Arrays.equals(MemoryFileProvider.TEST_BLOB, buf));
|
||||
}
|
||||
|
||||
// tests that we don't leak file descriptors or virtual address space
|
||||
@MediumTest
|
||||
public void testClose() throws Exception {
|
||||
ContentResolver resolver = getContext().getContentResolver();
|
||||
// open enough file descriptors that we will crash something if we leak FDs
|
||||
// or address space
|
||||
for (int i = 0; i < 1025; i++) {
|
||||
Uri uri = Uri.parse("content://com.android.unit_tests.content.MemoryFileProvider/huge");
|
||||
InputStream in = resolver.openInputStream(uri);
|
||||
assertNotNull("Failed to open stream number " + i, in);
|
||||
assertEquals(1000000, in.skip(1000000));
|
||||
byte[] buf = new byte[MemoryFileProvider.TEST_BLOB.length];
|
||||
int count = in.read(buf);
|
||||
assertEquals(buf.length, count);
|
||||
assertTrue(Arrays.equals(MemoryFileProvider.TEST_BLOB, buf));
|
||||
in.close();
|
||||
}
|
||||
}
|
||||
|
||||
// tests that we haven't broken AssestFileDescriptors for normal files.
|
||||
@MediumTest
|
||||
public void testFile() throws Exception {
|
||||
ContentResolver resolver = getContext().getContentResolver();
|
||||
Uri uri = Uri.parse("content://com.android.unit_tests.content.MemoryFileProvider/file");
|
||||
byte[] buf = new byte[MemoryFileProvider.TEST_BLOB.length];
|
||||
InputStream in = resolver.openInputStream(uri);
|
||||
assertNotNull(in);
|
||||
int count = in.read(buf);
|
||||
assertEquals(buf.length, count);
|
||||
assertEquals(-1, in.read());
|
||||
in.close();
|
||||
assertTrue(Arrays.equals(MemoryFileProvider.TEST_BLOB, buf));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -17,19 +17,21 @@
|
||||
package com.android.unit_tests.os;
|
||||
|
||||
import android.os.MemoryFile;
|
||||
import android.test.AndroidTestCase;
|
||||
import android.test.suitebuilder.annotation.LargeTest;
|
||||
import android.test.suitebuilder.annotation.MediumTest;
|
||||
import android.test.suitebuilder.annotation.SmallTest;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileDescriptor;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
|
||||
public class MemoryFileTest extends TestCase {
|
||||
public class MemoryFileTest extends AndroidTestCase {
|
||||
|
||||
private void compareBuffers(byte[] buffer1, byte[] buffer2, int length) throws Exception {
|
||||
for (int i = 0; i < length; i++) {
|
||||
@@ -163,6 +165,50 @@ public class MemoryFileTest extends TestCase {
|
||||
}
|
||||
}
|
||||
|
||||
@SmallTest
|
||||
public void testIsMemoryFile() throws Exception {
|
||||
MemoryFile file = new MemoryFile("MemoryFileTest", 1000000);
|
||||
FileDescriptor fd = file.getFileDescriptor();
|
||||
assertNotNull(fd);
|
||||
assertTrue(fd.valid());
|
||||
assertTrue(MemoryFile.isMemoryFile(fd));
|
||||
file.close();
|
||||
|
||||
assertFalse(MemoryFile.isMemoryFile(FileDescriptor.in));
|
||||
assertFalse(MemoryFile.isMemoryFile(FileDescriptor.out));
|
||||
assertFalse(MemoryFile.isMemoryFile(FileDescriptor.err));
|
||||
|
||||
File tempFile = File.createTempFile("MemoryFileTest",".tmp", getContext().getFilesDir());
|
||||
assertNotNull(file);
|
||||
FileOutputStream out = null;
|
||||
try {
|
||||
out = new FileOutputStream(tempFile);
|
||||
FileDescriptor fileFd = out.getFD();
|
||||
assertNotNull(fileFd);
|
||||
assertFalse(MemoryFile.isMemoryFile(fileFd));
|
||||
} finally {
|
||||
if (out != null) {
|
||||
out.close();
|
||||
}
|
||||
tempFile.delete();
|
||||
}
|
||||
}
|
||||
|
||||
public void testFileDescriptor() throws Exception {
|
||||
MemoryFile file = new MemoryFile("MemoryFileTest", 1000000);
|
||||
MemoryFile ref = new MemoryFile(file.getFileDescriptor(), file.length(), "r");
|
||||
byte[] buffer;
|
||||
|
||||
// write to original, read from reference
|
||||
file.writeBytes(testString, 0, 2000, testString.length);
|
||||
buffer = new byte[testString.length];
|
||||
ref.readBytes(buffer, 2000, 0, testString.length);
|
||||
compareBuffers(testString, buffer, testString.length);
|
||||
|
||||
file.close();
|
||||
ref.close(); // Doesn't actually do anything, since the file descriptor is not dup(2):ed
|
||||
}
|
||||
|
||||
private static final byte[] testString = new byte[] {
|
||||
3, 1, 4, 1, 5, 9, 2, 6, 5, 3, 5, 8, 9, 7, 9, 3, 2, 3, 8, 4, 6, 2, 6, 4, 3, 3, 8, 3, 2, 7, 9, 5, 0, 2, 8, 8, 4, 1, 9, 7, 1, 6, 9, 3, 9, 9, 3, 7, 5, 1, 0, 5, 8, 2, 0, 9, 7, 4, 9, 4, 4, 5, 9, 2, 3, 0, 7, 8, 1, 6, 4,
|
||||
0, 6, 2, 8, 6, 2, 0, 8, 9, 9, 8, 6, 2, 8, 0, 3, 4, 8, 2, 5, 3, 4, 2, 1, 1, 7, 0, 6, 7, 9, 8, 2, 1, 4, 8, 0, 8, 6, 5, 1, 3, 2, 8, 2, 3, 0, 6, 6, 4, 7, 0, 9, 3, 8, 4, 4, 6, 0, 9, 5, 5, 0, 5, 8, 2, 2, 3, 1, 7, 2,
|
||||
|
||||
Reference in New Issue
Block a user