Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6e59ee8

Browse files
Refactor and reformat unit tests.
1 parent 076b4c7 commit 6e59ee8

File tree

13 files changed

+84
-74
lines changed

13 files changed

+84
-74
lines changed

‎data/src/test/java/com/fernandocejas/android10/sample/data/ApplicationTestCase.java

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,8 +15,13 @@
1515
*/
1616
package com.fernandocejas.android10.sample.data;
1717

18+
import android.content.Context;
19+
import org.junit.Rule;
20+
import org.junit.rules.TestRule;
1821
import org.junit.runner.RunWith;
22+
import org.mockito.MockitoAnnotations;
1923
import org.robolectric.RobolectricGradleTestRunner;
24+
import org.robolectric.RuntimeEnvironment;
2025
import org.robolectric.annotation.Config;
2126

2227
/**
@@ -25,4 +30,14 @@
2530
*/
2631
@RunWith(RobolectricGradleTestRunner.class)
2732
@Config(constants = BuildConfig.class, application = ApplicationStub.class, sdk = 21)
28-
public abstract class ApplicationTestCase {}
33+
public abstract class ApplicationTestCase {
34+
35+
@Rule public TestRule injectMocksRule = (base, description) -> {
36+
MockitoAnnotations.initMocks(ApplicationTestCase.this);
37+
return base;
38+
};
39+
40+
public static Context context() {
41+
return RuntimeEnvironment.application;
42+
}
43+
}

‎data/src/test/java/com/fernandocejas/android10/sample/data/exception/RepositoryErrorBundleTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,26 @@
1818
import com.fernandocejas.android10.sample.data.ApplicationTestCase;
1919
import org.junit.Before;
2020
import org.junit.Test;
21+
import org.junit.runner.RunWith;
2122
import org.mockito.Mock;
22-
import org.mockito.MockitoAnnotations;
23+
import org.mockito.runners.MockitoJUnitRunner;
2324

2425
import static org.mockito.Mockito.verify;
2526

27+
@RunWith(MockitoJUnitRunner.class)
2628
public class RepositoryErrorBundleTest extends ApplicationTestCase {
2729

2830
private RepositoryErrorBundle repositoryErrorBundle;
2931

30-
@Mock
31-
private Exception mockException;
32+
@Mock private Exception mockException;
3233

3334
@Before
3435
public void setUp() {
35-
MockitoAnnotations.initMocks(this);
3636
repositoryErrorBundle = new RepositoryErrorBundle(mockException);
3737
}
3838

3939
@Test
40+
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
4041
public void testGetErrorMessageInteraction() {
4142
repositoryErrorBundle.getErrorMessage();
4243

‎data/src/test/java/com/fernandocejas/android10/sample/data/repository/UserDataRepositoryTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.fernandocejas.android10.sample.data.repository;
1717

18-
import com.fernandocejas.android10.sample.data.ApplicationTestCase;
1918
import com.fernandocejas.android10.sample.data.entity.UserEntity;
2019
import com.fernandocejas.android10.sample.data.entity.mapper.UserEntityDataMapper;
2120
import com.fernandocejas.android10.sample.data.repository.datasource.UserDataStore;
@@ -27,15 +26,17 @@
2726
import org.junit.Rule;
2827
import org.junit.Test;
2928
import org.junit.rules.ExpectedException;
29+
import org.junit.runner.RunWith;
3030
import org.mockito.Mock;
31-
import org.mockito.MockitoAnnotations;
31+
import org.mockito.runners.MockitoJUnitRunner;
3232
import rx.Observable;
3333

3434
import static org.mockito.BDDMockito.given;
3535
import static org.mockito.Matchers.anyInt;
3636
import static org.mockito.Mockito.verify;
3737

38-
public class UserDataRepositoryTest extends ApplicationTestCase {
38+
@RunWith(MockitoJUnitRunner.class)
39+
public class UserDataRepositoryTest {
3940

4041
private static final int FAKE_USER_ID = 123;
4142

@@ -52,7 +53,6 @@ public class UserDataRepositoryTest extends ApplicationTestCase {
5253

5354
@Before
5455
public void setUp() {
55-
MockitoAnnotations.initMocks(this);
5656
userDataRepository = new UserDataRepository(mockUserDataStoreFactory,
5757
mockUserEntityDataMapper);
5858

‎data/src/test/java/com/fernandocejas/android10/sample/data/repository/datasource/CloudUserDataStoreTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,21 @@
1515
*/
1616
package com.fernandocejas.android10.sample.data.repository.datasource;
1717

18-
import com.fernandocejas.android10.sample.data.ApplicationTestCase;
1918
import com.fernandocejas.android10.sample.data.cache.UserCache;
2019
import com.fernandocejas.android10.sample.data.entity.UserEntity;
2120
import com.fernandocejas.android10.sample.data.net.RestApi;
2221
import org.junit.Before;
2322
import org.junit.Test;
23+
import org.junit.runner.RunWith;
2424
import org.mockito.Mock;
25-
import org.mockito.MockitoAnnotations;
25+
import org.mockito.runners.MockitoJUnitRunner;
2626
import rx.Observable;
2727

2828
import static org.mockito.BDDMockito.given;
2929
import static org.mockito.Mockito.verify;
3030

31-
public class CloudUserDataStoreTest extends ApplicationTestCase {
31+
@RunWith(MockitoJUnitRunner.class)
32+
public class CloudUserDataStoreTest {
3233

3334
private static final int FAKE_USER_ID = 765;
3435

@@ -39,7 +40,6 @@ public class CloudUserDataStoreTest extends ApplicationTestCase {
3940

4041
@Before
4142
public void setUp() {
42-
MockitoAnnotations.initMocks(this);
4343
cloudUserDataStore = new CloudUserDataStore(mockRestApi, mockUserCache);
4444
}
4545

‎data/src/test/java/com/fernandocejas/android10/sample/data/repository/datasource/DiskUserDataStoreTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,19 @@
1515
*/
1616
package com.fernandocejas.android10.sample.data.repository.datasource;
1717

18-
import com.fernandocejas.android10.sample.data.ApplicationTestCase;
1918
import com.fernandocejas.android10.sample.data.cache.UserCache;
2019
import org.junit.Before;
2120
import org.junit.Rule;
2221
import org.junit.Test;
2322
import org.junit.rules.ExpectedException;
23+
import org.junit.runner.RunWith;
2424
import org.mockito.Mock;
25-
import org.mockito.MockitoAnnotations;
25+
import org.mockito.runners.MockitoJUnitRunner;
2626

2727
import static org.mockito.Mockito.verify;
2828

29-
public class DiskUserDataStoreTest extends ApplicationTestCase {
29+
@RunWith(MockitoJUnitRunner.class)
30+
public class DiskUserDataStoreTest {
3031

3132
private static final int FAKE_USER_ID = 11;
3233

@@ -38,7 +39,6 @@ public class DiskUserDataStoreTest extends ApplicationTestCase {
3839

3940
@Before
4041
public void setUp() {
41-
MockitoAnnotations.initMocks(this);
4242
diskUserDataStore = new DiskUserDataStore(mockUserCache);
4343
}
4444

‎data/src/test/java/com/fernandocejas/android10/sample/data/repository/datasource/UserDataStoreFactoryTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.junit.Before;
2121
import org.junit.Test;
2222
import org.mockito.Mock;
23-
import org.mockito.MockitoAnnotations;
2423
import org.robolectric.RuntimeEnvironment;
2524

2625
import static org.hamcrest.CoreMatchers.instanceOf;
@@ -36,14 +35,11 @@ public class UserDataStoreFactoryTest extends ApplicationTestCase {
3635

3736
private UserDataStoreFactory userDataStoreFactory;
3837

39-
@Mock
40-
private UserCache mockUserCache;
38+
@Mock private UserCache mockUserCache;
4139

4240
@Before
4341
public void setUp() {
44-
MockitoAnnotations.initMocks(this);
45-
userDataStoreFactory =
46-
new UserDataStoreFactory(RuntimeEnvironment.application, mockUserCache);
42+
userDataStoreFactory = new UserDataStoreFactory(RuntimeEnvironment.application, mockUserCache);
4743
}
4844

4945
@Test

‎domain/src/test/java/com/fernandocejas/android10/sample/domain/exception/DefaultErrorBundleTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* you may not use this file except in compliance with the License.
66
* You may obtain a copy of the License at
77
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
8+
* http://www.apache.org/licenses/LICENSE-2.0
99
*
1010
* Unless required by applicable law or agreed to in writing, software
1111
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,20 +17,20 @@
1717

1818
import org.junit.Before;
1919
import org.junit.Test;
20+
import org.junit.runner.RunWith;
2021
import org.mockito.Mock;
21-
import org.mockito.MockitoAnnotations;
22+
import org.mockito.runners.MockitoJUnitRunner;
2223

2324
import static org.mockito.Mockito.verify;
2425

26+
@RunWith(MockitoJUnitRunner.class)
2527
public class DefaultErrorBundleTest {
2628
private DefaultErrorBundle defaultErrorBundle;
2729

28-
@Mock
29-
private Exception mockException;
30+
@Mock private Exception mockException;
3031

3132
@Before
3233
public void setUp() {
33-
MockitoAnnotations.initMocks(this);
3434
defaultErrorBundle = new DefaultErrorBundle(mockException);
3535
}
3636

@@ -40,4 +40,4 @@ public void testGetErrorMessageInteraction() {
4040

4141
verify(mockException).getMessage();
4242
}
43-
}
43+
}

‎domain/src/test/java/com/fernandocejas/android10/sample/domain/interactor/GetUserDetailsTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@
2020
import com.fernandocejas.android10.sample.domain.repository.UserRepository;
2121
import org.junit.Before;
2222
import org.junit.Test;
23+
import org.junit.runner.RunWith;
2324
import org.mockito.Mock;
24-
import org.mockito.MockitoAnnotations;
25+
import org.mockito.runners.MockitoJUnitRunner;
2526

2627
import static org.mockito.Mockito.verify;
2728
import static org.mockito.Mockito.verifyNoMoreInteractions;
2829
import static org.mockito.Mockito.verifyZeroInteractions;
2930

31+
@RunWith(MockitoJUnitRunner.class)
3032
public class GetUserDetailsTest {
3133

3234
private static final int FAKE_USER_ID = 123;
@@ -39,7 +41,6 @@ public class GetUserDetailsTest {
3941

4042
@Before
4143
public void setUp() {
42-
MockitoAnnotations.initMocks(this);
4344
getUserDetails = new GetUserDetails(FAKE_USER_ID, mockUserRepository,
4445
mockThreadExecutor, mockPostExecutionThread);
4546
}

‎domain/src/test/java/com/fernandocejas/android10/sample/domain/interactor/GetUserListTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@
2020
import com.fernandocejas.android10.sample.domain.repository.UserRepository;
2121
import org.junit.Before;
2222
import org.junit.Test;
23+
import org.junit.runner.RunWith;
2324
import org.mockito.Mock;
24-
import org.mockito.MockitoAnnotations;
25+
import org.mockito.runners.MockitoJUnitRunner;
2526

2627
import static org.mockito.Mockito.verify;
2728
import static org.mockito.Mockito.verifyNoMoreInteractions;
2829
import static org.mockito.Mockito.verifyZeroInteractions;
2930

31+
@RunWith(MockitoJUnitRunner.class)
3032
public class GetUserListTest {
3133

3234
private GetUserList getUserList;
@@ -37,7 +39,6 @@ public class GetUserListTest {
3739

3840
@Before
3941
public void setUp() {
40-
MockitoAnnotations.initMocks(this);
4142
getUserList = new GetUserList(mockUserRepository, mockThreadExecutor,
4243
mockPostExecutionThread);
4344
}

‎domain/src/test/java/com/fernandocejas/android10/sample/domain/interactor/UseCaseTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
import com.fernandocejas.android10.sample.domain.executor.ThreadExecutor;
2020
import org.junit.Before;
2121
import org.junit.Test;
22+
import org.junit.runner.RunWith;
2223
import org.mockito.Mock;
23-
import org.mockito.MockitoAnnotations;
24+
import org.mockito.runners.MockitoJUnitRunner;
2425
import rx.Observable;
2526
import rx.Subscriber;
2627
import rx.observers.TestSubscriber;
@@ -30,6 +31,7 @@
3031
import static org.hamcrest.core.Is.is;
3132
import static org.mockito.BDDMockito.given;
3233

34+
@RunWith(MockitoJUnitRunner.class)
3335
public class UseCaseTest {
3436

3537
private UseCaseTestClass useCase;
@@ -39,7 +41,6 @@ public class UseCaseTest {
3941

4042
@Before
4143
public void setUp() {
42-
MockitoAnnotations.initMocks(this);
4344
this.useCase = new UseCaseTestClass(mockThreadExecutor, mockPostExecutionThread);
4445
}
4546

@@ -67,7 +68,7 @@ public void testSubscriptionWhenExecutingUseCase() {
6768

6869
private static class UseCaseTestClass extends UseCase {
6970

70-
protectedUseCaseTestClass(
71+
UseCaseTestClass(
7172
ThreadExecutor threadExecutor,
7273
PostExecutionThread postExecutionThread) {
7374
super(threadExecutor, postExecutionThread);
@@ -81,4 +82,4 @@ protected UseCaseTestClass(
8182
super.execute(UseCaseSubscriber);
8283
}
8384
}
84-
}
85+
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /