Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14ba2e78 authored by Stephan Linzner's avatar Stephan Linzner Committed by android-build-merger
Browse files

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

am: dac0708e

* commit 'dac0708e':
  Un-deprecated Android mock testing APIs

Change-Id: I4a853b57b8cfbc834e43e050f26bc078c1b4e92c
parents 0a16a8d1 dac0708e

api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -37925,7 +37925,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[]);









@@ -37937,13 +37937,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);

























api/system-current.txt



+3
−3




























Original line number
Diff line number
Diff line








@@ -40911,7 +40911,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[]);









@@ -40923,13 +40923,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);

























api/test-current.txt



+3
−3




























Original line number
Diff line number
Diff line








@@ -38003,7 +38003,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[]);









@@ -38015,13 +38015,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);

























test-runner/src/android/test/mock/MockContentProvider.java



+0
−5




























Original line number
Diff line number
Diff line








@@ -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

































test-runner/src/android/test/mock/MockContentResolver.java



+0
−5




























Original line number
Diff line number
Diff line








@@ -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;