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

Merge "Un-deprecated Android mock testing APIs" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-26 00:22:28 +00:00
committed by Android (Google) Code Review
parent 7ab1a4d286 ebdc157bc0
commit dac0708ea0
6 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/current.txt
View File

@@ -37762,7 +37762,7 @@ package android.test.mock {
ctor public MockApplication();
}
public deprecated class MockContentProvider extends android.content.ContentProvider {
public class MockContentProvider extends android.content.ContentProvider {
ctor protected MockContentProvider();
ctor public MockContentProvider(android.content.Context);
ctor public MockContentProvider(android.content.Context, java.lang.String, java.lang.String, android.content.pm.PathPermission[]);
@@ -37774,13 +37774,13 @@ package android.test.mock {
method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]);
}
public deprecated class MockContentResolver extends android.content.ContentResolver {
public class MockContentResolver extends android.content.ContentResolver {
ctor public MockContentResolver();
ctor public MockContentResolver(android.content.Context);
method public void addProvider(java.lang.String, android.content.ContentProvider);
}
public deprecated class MockContext extends android.content.Context {
public class MockContext extends android.content.Context {
ctor public MockContext();
method public boolean bindService(android.content.Intent, android.content.ServiceConnection, int);
method public int checkCallingOrSelfPermission(java.lang.String);

6
api/system-current.txt
View File

@@ -40748,7 +40748,7 @@ package android.test.mock {
ctor public MockApplication();
}
public deprecated class MockContentProvider extends android.content.ContentProvider {
public class MockContentProvider extends android.content.ContentProvider {
ctor protected MockContentProvider();
ctor public MockContentProvider(android.content.Context);
ctor public MockContentProvider(android.content.Context, java.lang.String, java.lang.String, android.content.pm.PathPermission[]);
@@ -40760,13 +40760,13 @@ package android.test.mock {
method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]);
}
public deprecated class MockContentResolver extends android.content.ContentResolver {
public class MockContentResolver extends android.content.ContentResolver {
ctor public MockContentResolver();
ctor public MockContentResolver(android.content.Context);
method public void addProvider(java.lang.String, android.content.ContentProvider);
}
public deprecated class MockContext extends android.content.Context {
public class MockContext extends android.content.Context {
ctor public MockContext();
method public boolean bindService(android.content.Intent, android.content.ServiceConnection, int);
method public int checkCallingOrSelfPermission(java.lang.String);

6
api/test-current.txt
View File

@@ -37839,7 +37839,7 @@ package android.test.mock {
ctor public MockApplication();
}
public deprecated class MockContentProvider extends android.content.ContentProvider {
public class MockContentProvider extends android.content.ContentProvider {
ctor protected MockContentProvider();
ctor public MockContentProvider(android.content.Context);
ctor public MockContentProvider(android.content.Context, java.lang.String, java.lang.String, android.content.pm.PathPermission[]);
@@ -37851,13 +37851,13 @@ package android.test.mock {
method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]);
}
public deprecated class MockContentResolver extends android.content.ContentResolver {
public class MockContentResolver extends android.content.ContentResolver {
ctor public MockContentResolver();
ctor public MockContentResolver(android.content.Context);
method public void addProvider(java.lang.String, android.content.ContentProvider);
}
public deprecated class MockContext extends android.content.Context {
public class MockContext extends android.content.Context {
ctor public MockContext();
method public boolean bindService(android.content.Intent, android.content.ServiceConnection, int);
method public int checkCallingOrSelfPermission(java.lang.String);

5
test-runner/src/android/test/mock/MockContentProvider.java
View File

@@ -41,12 +41,7 @@ import java.util.ArrayList;
* Mock implementation of ContentProvider. All methods are non-functional and throw
* {@link java.lang.UnsupportedOperationException}. Tests can extend this class to
* implement behavior needed for tests.
*
* @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
* New tests should be written using the
* <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
@Deprecated
public class MockContentProvider extends ContentProvider {
/*
* Note: if you add methods to ContentProvider, you must add similar methods to

5
test-runner/src/android/test/mock/MockContentResolver.java
View File

@@ -49,12 +49,7 @@ import java.util.Map;
* <p>For more information about application testing, read the
* <a href="{@docRoot}guide/topics/testing/index.html">Testing</a> developer guide.</p>
* </div>
*
* @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
* New tests should be written using the
* <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
@Deprecated
public class MockContentResolver extends ContentResolver {
Map<String, ContentProvider> mProviders;

5
test-runner/src/android/test/mock/MockContext.java
View File

@@ -55,12 +55,7 @@ import java.io.InputStream;
* A mock {@link android.content.Context} class. All methods are non-functional and throw
* {@link java.lang.UnsupportedOperationException}. You can use this to inject other dependencies,
* mocks, or monitors into the classes you are testing.
*
* @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
* New tests should be written using the
* <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
*/
@Deprecated
public class MockContext extends Context {
@Override