Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix build."

Browse Source
This commit is contained in:
Dianne Hackborn
2013-01-16 23:35:39 +00:00
committed by Android (Google) Code Review
parent d4fe37bee7 9139625aae
commit a7110fd19a
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java
View File

@@ -38,6 +38,7 @@ public class MediaInserterTest extends InstrumentationTestCase {
private MediaInserter mMediaInserter; private MediaInserter mMediaInserter;
private static final int TEST_BUFFER_SIZE = 10; private static final int TEST_BUFFER_SIZE = 10;
private IContentProvider mMockProvider; private IContentProvider mMockProvider;
private String mPackageName;
private int mFilesCounter; private int mFilesCounter;
private int mAudioCounter; private int mAudioCounter;
@@ -83,7 +84,9 @@ public class MediaInserterTest extends InstrumentationTestCase {
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
mMockProvider = EasyMock.createMock(IContentProvider.class); mMockProvider = EasyMock.createMock(IContentProvider.class);
mMediaInserter = new MediaInserter(mMockProvider, TEST_BUFFER_SIZE); mMediaInserter = new MediaInserter(mMockProvider,
mPackageName, TEST_BUFFER_SIZE);
mPackageName = getInstrumentation().getContext().getPackageName();
mFilesCounter = 0; mFilesCounter = 0;
mAudioCounter = 0; mAudioCounter = 0;
mVideoCounter = 0; mVideoCounter = 0;
@@ -144,7 +147,7 @@ public class MediaInserterTest extends InstrumentationTestCase {
@SmallTest @SmallTest
public void testInsertContentsEqualToBufferSize() throws Exception { public void testInsertContentsEqualToBufferSize() throws Exception {
EasyMock.expect(mMockProvider.bulkInsert( EasyMock.expect(mMockProvider.bulkInsert(mPackageName,
(Uri) EasyMock.anyObject(), (ContentValues[]) EasyMock.anyObject())).andReturn(1); (Uri) EasyMock.anyObject(), (ContentValues[]) EasyMock.anyObject())).andReturn(1);
EasyMock.expectLastCall().times(4); EasyMock.expectLastCall().times(4);
EasyMock.replay(mMockProvider); EasyMock.replay(mMockProvider);
@@ -159,7 +162,7 @@ public class MediaInserterTest extends InstrumentationTestCase {
@SmallTest @SmallTest
public void testInsertContentsMoreThanBufferSize() throws Exception { public void testInsertContentsMoreThanBufferSize() throws Exception {
EasyMock.expect(mMockProvider.bulkInsert( EasyMock.expect(mMockProvider.bulkInsert(mPackageName,
(Uri) EasyMock.anyObject(), (ContentValues[]) EasyMock.anyObject())).andReturn(1); (Uri) EasyMock.anyObject(), (ContentValues[]) EasyMock.anyObject())).andReturn(1);
EasyMock.expectLastCall().times(4); EasyMock.expectLastCall().times(4);
EasyMock.replay(mMockProvider); EasyMock.replay(mMockProvider);
@@ -183,7 +186,7 @@ public class MediaInserterTest extends InstrumentationTestCase {
@SmallTest @SmallTest
public void testFlushAllWithSomeContents() throws Exception { public void testFlushAllWithSomeContents() throws Exception {
EasyMock.expect(mMockProvider.bulkInsert( EasyMock.expect(mMockProvider.bulkInsert(mPackageName,
(Uri) EasyMock.anyObject(), (ContentValues[]) EasyMock.anyObject())).andReturn(1); (Uri) EasyMock.anyObject(), (ContentValues[]) EasyMock.anyObject())).andReturn(1);
EasyMock.expectLastCall().times(4); EasyMock.expectLastCall().times(4);
EasyMock.replay(mMockProvider); EasyMock.replay(mMockProvider);
@@ -199,7 +202,7 @@ public class MediaInserterTest extends InstrumentationTestCase {
@SmallTest @SmallTest
public void testInsertContentsAfterFlushAll() throws Exception { public void testInsertContentsAfterFlushAll() throws Exception {
EasyMock.expect(mMockProvider.bulkInsert( EasyMock.expect(mMockProvider.bulkInsert(mPackageName,
(Uri) EasyMock.anyObject(), (ContentValues[]) EasyMock.anyObject())).andReturn(1); (Uri) EasyMock.anyObject(), (ContentValues[]) EasyMock.anyObject())).andReturn(1);
EasyMock.expectLastCall().times(8); EasyMock.expectLastCall().times(8);
EasyMock.replay(mMockProvider); EasyMock.replay(mMockProvider);
@@ -220,16 +223,20 @@ public class MediaInserterTest extends InstrumentationTestCase {
@SmallTest @SmallTest
public void testInsertContentsWithDifferentSizePerContentType() throws Exception { public void testInsertContentsWithDifferentSizePerContentType() throws Exception {
EasyMock.expect(mMockProvider.bulkInsert(MediaUriMatcher.expectMediaUri(sFilesUri), EasyMock.expect(mMockProvider.bulkInsert(mPackageName,
MediaUriMatcher.expectMediaUri(sFilesUri),
(ContentValues[]) EasyMock.anyObject())).andReturn(1); (ContentValues[]) EasyMock.anyObject())).andReturn(1);
EasyMock.expectLastCall().times(1); EasyMock.expectLastCall().times(1);
EasyMock.expect(mMockProvider.bulkInsert(MediaUriMatcher.expectMediaUri(sAudioUri), EasyMock.expect(mMockProvider.bulkInsert(mPackageName,
MediaUriMatcher.expectMediaUri(sAudioUri),
(ContentValues[]) EasyMock.anyObject())).andReturn(1); (ContentValues[]) EasyMock.anyObject())).andReturn(1);
EasyMock.expectLastCall().times(2); EasyMock.expectLastCall().times(2);
EasyMock.expect(mMockProvider.bulkInsert(MediaUriMatcher.expectMediaUri(sVideoUri), EasyMock.expect(mMockProvider.bulkInsert(mPackageName,
MediaUriMatcher.expectMediaUri(sVideoUri),
(ContentValues[]) EasyMock.anyObject())).andReturn(1); (ContentValues[]) EasyMock.anyObject())).andReturn(1);
EasyMock.expectLastCall().times(3); EasyMock.expectLastCall().times(3);
EasyMock.expect(mMockProvider.bulkInsert(MediaUriMatcher.expectMediaUri(sImagesUri), EasyMock.expect(mMockProvider.bulkInsert(mPackageName,
MediaUriMatcher.expectMediaUri(sImagesUri),
(ContentValues[]) EasyMock.anyObject())).andReturn(1); (ContentValues[]) EasyMock.anyObject())).andReturn(1);
EasyMock.expectLastCall().times(4); EasyMock.expectLastCall().times(4);
EasyMock.replay(mMockProvider); EasyMock.replay(mMockProvider);