Skip to content

Commit

Permalink
Respond to review comments
Browse files Browse the repository at this point in the history
Change-Id: Ie03a23b5b04af5146b887101566d765315cad356
  • Loading branch information
samtstern committed Jan 15, 2019
1 parent e64510d commit 4540513
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ext {

mavenGroup = 'pub.devrel'
mavenArtifactId = 'easypermissions'
mavenVersion = '2.0.0'
mavenVersion = '2.0.1-SNAPSHOT'

bintrayOrg = 'easygoogle'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ public class EasyPermissionsLowApiTest {
Manifest.permission.READ_SMS, Manifest.permission.ACCESS_FINE_LOCATION};

private TestActivity spyActivity;
private TestAppCompatActivity spySupportActivity;
private TestAppCompatActivity spyAppCompatActivity;
private TestFragment spyFragment;
private ActivityController<TestActivity> activityController;
private ActivityController<TestAppCompatActivity> supportActivityController;
private ActivityController<TestAppCompatActivity> appCompatActivityController;
private SupportFragmentController<TestFragment> supportController;
@Captor
private ArgumentCaptor<Integer> integerCaptor;
Expand Down Expand Up @@ -84,9 +84,9 @@ public void shouldCallbackOnPermissionGranted_whenRequestFromActivity() {

@Test
public void shouldCallbackOnPermissionGranted_whenRequestFromSupportActivity() {
EasyPermissions.requestPermissions(spySupportActivity, RATIONALE, TestAppCompatActivity.REQUEST_CODE, ALL_PERMS);
EasyPermissions.requestPermissions(spyAppCompatActivity, RATIONALE, TestAppCompatActivity.REQUEST_CODE, ALL_PERMS);

verify(spySupportActivity, times(1))
verify(spyAppCompatActivity, times(1))
.onPermissionsGranted(integerCaptor.capture(), listCaptor.capture());
assertThat(integerCaptor.getValue()).isEqualTo(TestAppCompatActivity.REQUEST_CODE);
assertThat(listCaptor.getValue()).containsAllIn(ALL_PERMS);
Expand All @@ -105,19 +105,19 @@ public void shouldCallbackOnPermissionGranted_whenRequestFromFragment() {
private void setUpActivityAndFragment() {
activityController = Robolectric.buildActivity(TestActivity.class)
.create().start().resume();
supportActivityController = Robolectric.buildActivity(TestAppCompatActivity.class)
appCompatActivityController = Robolectric.buildActivity(TestAppCompatActivity.class)
.create().start().resume();
supportController = SupportFragmentController.of(new TestFragment())
.create().start().resume();

spyActivity = Mockito.spy(activityController.get());
spySupportActivity = Mockito.spy(supportActivityController.get());
spyAppCompatActivity = Mockito.spy(appCompatActivityController.get());
spyFragment = Mockito.spy(supportController.get());
}

private void tearDownActivityAndFragment() {
activityController.pause().stop().destroy();
supportActivityController.pause().stop().destroy();
appCompatActivityController.pause().stop().destroy();
supportController.pause().stop().destroy();
}
}

0 comments on commit 4540513

Please sign in to comment.