From 5b16f32ebbea84622abf47daeb86c08b88fc9c7b Mon Sep 17 00:00:00 2001 From: ImangazalievM Date: Mon, 15 Jan 2018 20:50:11 +0300 Subject: [PATCH] Renamed package "repository" to "repositories", removed unnecessary classes --- .../data/filesystem/UrlImageSaver.java | 2 +- .../CommentsRepositoryImpl.java | 4 +- .../FollowersRepositoryImpl.java | 4 +- .../ImagesRepositoryImpl.java | 4 +- .../ShotsRepositoryImpl.java | 6 +- .../TempDataRepositoryImpl.java | 4 +- .../TempPreferencesImpl.java | 4 +- .../UsersRepositoryImpl.java | 4 +- .../datasource/DribbbleSearchDataSource.java | 2 +- .../di/global/ApplicationComponent.java | 10 +- .../bubbble/di/global/DataModule.java | 26 ++-- .../CommentsRepository.java | 2 +- .../FollowersRepository.java | 2 +- .../ImagesRepository.java | 2 +- .../ShotsRepository.java | 2 +- .../TempDataRepository.java | 2 +- .../TempPreferences.java | 2 +- .../UsersRepository.java | 2 +- .../shotdetails/ShotDetailsInteractor.java | 6 +- .../domain/shotslist/ShotsInteractor.java | 2 +- .../shotssearch/ShotsSearchInteractor.java | 2 +- .../domain/shotzoom/ShotZoomInteractor.java | 2 +- .../userprofile/UserDetailsInteractor.java | 2 +- .../userprofile/UserFollowersInteractor.java | 2 +- .../userprofile/UserProfileInteractor.java | 2 +- .../userprofile/UserShotsInteractor.java | 4 +- .../bubbble/di/TestApplicationComponent.java | 30 ---- .../di/modules/TestApplicationModule.java | 25 ---- .../bubbble/di/modules/TestDataModule.java | 129 ------------------ .../mvp/presenters/MainPresenterTest.java | 4 +- .../presenters/ShotDetailsPresenterTest.java | 4 +- .../mvp/presenters/ShotZoomPresenterTest.java | 4 +- .../mvp/presenters/ShotsPresenterTest.java | 4 +- .../presenters/ShotsSearchPresenterTest.java | 4 +- .../presenters/UserDetailsPresenterTest.java | 4 +- .../UserFollowersPresenterTest.java | 4 +- .../presenters/UserProfilePresenterTest.java | 4 +- .../presenters/UserShotsPresenterTest.java | 4 +- ...vider.java => TestSchedulersProvider.java} | 2 +- gradle.properties | 6 +- 40 files changed, 75 insertions(+), 259 deletions(-) rename app/src/main/java/com/imangazalievm/bubbble/data/{repository => repositories}/CommentsRepositoryImpl.java (85%) rename app/src/main/java/com/imangazalievm/bubbble/data/{repository => repositories}/FollowersRepositoryImpl.java (85%) rename app/src/main/java/com/imangazalievm/bubbble/data/{repository => repositories}/ImagesRepositoryImpl.java (81%) rename app/src/main/java/com/imangazalievm/bubbble/data/{repository => repositories}/ShotsRepositoryImpl.java (90%) rename app/src/main/java/com/imangazalievm/bubbble/data/{repository => repositories}/TempDataRepositoryImpl.java (89%) rename app/src/main/java/com/imangazalievm/bubbble/data/{repository => repositories}/TempPreferencesImpl.java (89%) rename app/src/main/java/com/imangazalievm/bubbble/data/{repository => repositories}/UsersRepositoryImpl.java (81%) rename app/src/main/java/com/imangazalievm/bubbble/data/{repository => repositories}/datasource/DribbbleSearchDataSource.java (98%) rename app/src/main/java/com/imangazalievm/bubbble/domain/global/{repository => repositories}/CommentsRepository.java (83%) rename app/src/main/java/com/imangazalievm/bubbble/domain/global/{repository => repositories}/FollowersRepository.java (84%) rename app/src/main/java/com/imangazalievm/bubbble/domain/global/{repository => repositories}/ImagesRepository.java (66%) rename app/src/main/java/com/imangazalievm/bubbble/domain/global/{repository => repositories}/ShotsRepository.java (91%) rename app/src/main/java/com/imangazalievm/bubbble/domain/global/{repository => repositories}/TempDataRepository.java (77%) rename app/src/main/java/com/imangazalievm/bubbble/domain/global/{repository => repositories}/TempPreferences.java (76%) rename app/src/main/java/com/imangazalievm/bubbble/domain/global/{repository => repositories}/UsersRepository.java (73%) delete mode 100644 app/src/unitTests/java/com/imangazalievm/bubbble/di/TestApplicationComponent.java delete mode 100644 app/src/unitTests/java/com/imangazalievm/bubbble/di/modules/TestApplicationModule.java delete mode 100644 app/src/unitTests/java/com/imangazalievm/bubbble/di/modules/TestDataModule.java rename app/src/unitTests/java/com/imangazalievm/bubbble/test/{TestSchedulerProvider.java => TestSchedulersProvider.java} (88%) diff --git a/app/src/main/java/com/imangazalievm/bubbble/data/filesystem/UrlImageSaver.java b/app/src/main/java/com/imangazalievm/bubbble/data/filesystem/UrlImageSaver.java index f1ce95b..b2ad4e0 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/data/filesystem/UrlImageSaver.java +++ b/app/src/main/java/com/imangazalievm/bubbble/data/filesystem/UrlImageSaver.java @@ -21,7 +21,7 @@ public UrlImageSaver(Context context) { this.destinationFolder = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS); } - public void saveImage(String imageUrl) throws IOException { + public void saveImage(String imageUrl) { String imageFileName = imageUrl.substring(imageUrl.lastIndexOf('/') + 1, imageUrl.length()); Uri uri = Uri.parse(imageUrl); diff --git a/app/src/main/java/com/imangazalievm/bubbble/data/repository/CommentsRepositoryImpl.java b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/CommentsRepositoryImpl.java similarity index 85% rename from app/src/main/java/com/imangazalievm/bubbble/data/repository/CommentsRepositoryImpl.java rename to app/src/main/java/com/imangazalievm/bubbble/data/repositories/CommentsRepositoryImpl.java index 59bdb12..d815024 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/data/repository/CommentsRepositoryImpl.java +++ b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/CommentsRepositoryImpl.java @@ -1,9 +1,9 @@ -package com.imangazalievm.bubbble.data.repository; +package com.imangazalievm.bubbble.data.repositories; import com.imangazalievm.bubbble.data.network.DribbbleApiService; import com.imangazalievm.bubbble.domain.global.models.Comment; import com.imangazalievm.bubbble.domain.global.models.ShotCommentsRequestParams; -import com.imangazalievm.bubbble.domain.global.repository.CommentsRepository; +import com.imangazalievm.bubbble.domain.global.repositories.CommentsRepository; import java.util.List; diff --git a/app/src/main/java/com/imangazalievm/bubbble/data/repository/FollowersRepositoryImpl.java b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/FollowersRepositoryImpl.java similarity index 85% rename from app/src/main/java/com/imangazalievm/bubbble/data/repository/FollowersRepositoryImpl.java rename to app/src/main/java/com/imangazalievm/bubbble/data/repositories/FollowersRepositoryImpl.java index d9a5fe2..7de5130 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/data/repository/FollowersRepositoryImpl.java +++ b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/FollowersRepositoryImpl.java @@ -1,9 +1,9 @@ -package com.imangazalievm.bubbble.data.repository; +package com.imangazalievm.bubbble.data.repositories; import com.imangazalievm.bubbble.data.network.DribbbleApiService; import com.imangazalievm.bubbble.domain.global.models.Follow; import com.imangazalievm.bubbble.domain.global.models.UserFollowersRequestParams; -import com.imangazalievm.bubbble.domain.global.repository.FollowersRepository; +import com.imangazalievm.bubbble.domain.global.repositories.FollowersRepository; import java.util.List; diff --git a/app/src/main/java/com/imangazalievm/bubbble/data/repository/ImagesRepositoryImpl.java b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/ImagesRepositoryImpl.java similarity index 81% rename from app/src/main/java/com/imangazalievm/bubbble/data/repository/ImagesRepositoryImpl.java rename to app/src/main/java/com/imangazalievm/bubbble/data/repositories/ImagesRepositoryImpl.java index 8a303c6..d3449ba 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/data/repository/ImagesRepositoryImpl.java +++ b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/ImagesRepositoryImpl.java @@ -1,7 +1,7 @@ -package com.imangazalievm.bubbble.data.repository; +package com.imangazalievm.bubbble.data.repositories; import com.imangazalievm.bubbble.data.filesystem.UrlImageSaver; -import com.imangazalievm.bubbble.domain.global.repository.ImagesRepository; +import com.imangazalievm.bubbble.domain.global.repositories.ImagesRepository; import javax.inject.Inject; diff --git a/app/src/main/java/com/imangazalievm/bubbble/data/repository/ShotsRepositoryImpl.java b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/ShotsRepositoryImpl.java similarity index 90% rename from app/src/main/java/com/imangazalievm/bubbble/data/repository/ShotsRepositoryImpl.java rename to app/src/main/java/com/imangazalievm/bubbble/data/repositories/ShotsRepositoryImpl.java index 1bf6fe7..5b924df 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/data/repository/ShotsRepositoryImpl.java +++ b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/ShotsRepositoryImpl.java @@ -1,14 +1,14 @@ -package com.imangazalievm.bubbble.data.repository; +package com.imangazalievm.bubbble.data.repositories; import com.imangazalievm.bubbble.Constants; import com.imangazalievm.bubbble.data.network.DribbbleApiConstants; import com.imangazalievm.bubbble.data.network.DribbbleApiService; -import com.imangazalievm.bubbble.data.repository.datasource.DribbbleSearchDataSource; +import com.imangazalievm.bubbble.data.repositories.datasource.DribbbleSearchDataSource; import com.imangazalievm.bubbble.domain.global.models.Shot; import com.imangazalievm.bubbble.domain.global.models.ShotsRequestParams; import com.imangazalievm.bubbble.domain.global.models.ShotsSearchRequestParams; import com.imangazalievm.bubbble.domain.global.models.UserShotsRequestParams; -import com.imangazalievm.bubbble.domain.global.repository.ShotsRepository; +import com.imangazalievm.bubbble.domain.global.repositories.ShotsRepository; import java.util.List; diff --git a/app/src/main/java/com/imangazalievm/bubbble/data/repository/TempDataRepositoryImpl.java b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/TempDataRepositoryImpl.java similarity index 89% rename from app/src/main/java/com/imangazalievm/bubbble/data/repository/TempDataRepositoryImpl.java rename to app/src/main/java/com/imangazalievm/bubbble/data/repositories/TempDataRepositoryImpl.java index f4997a1..4c7d067 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/data/repository/TempDataRepositoryImpl.java +++ b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/TempDataRepositoryImpl.java @@ -1,10 +1,10 @@ -package com.imangazalievm.bubbble.data.repository; +package com.imangazalievm.bubbble.data.repositories; import android.content.Context; import android.content.SharedPreferences; import com.imangazalievm.bubbble.BuildConfig; -import com.imangazalievm.bubbble.domain.global.repository.TempDataRepository; +import com.imangazalievm.bubbble.domain.global.repositories.TempDataRepository; import javax.inject.Inject; diff --git a/app/src/main/java/com/imangazalievm/bubbble/data/repository/TempPreferencesImpl.java b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/TempPreferencesImpl.java similarity index 89% rename from app/src/main/java/com/imangazalievm/bubbble/data/repository/TempPreferencesImpl.java rename to app/src/main/java/com/imangazalievm/bubbble/data/repositories/TempPreferencesImpl.java index b528dc6..de87c2d 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/data/repository/TempPreferencesImpl.java +++ b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/TempPreferencesImpl.java @@ -1,10 +1,10 @@ -package com.imangazalievm.bubbble.data.repository; +package com.imangazalievm.bubbble.data.repositories; import android.content.Context; import android.content.SharedPreferences; import com.imangazalievm.bubbble.BuildConfig; -import com.imangazalievm.bubbble.domain.global.repository.TempPreferences; +import com.imangazalievm.bubbble.domain.global.repositories.TempPreferences; import javax.inject.Inject; diff --git a/app/src/main/java/com/imangazalievm/bubbble/data/repository/UsersRepositoryImpl.java b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/UsersRepositoryImpl.java similarity index 81% rename from app/src/main/java/com/imangazalievm/bubbble/data/repository/UsersRepositoryImpl.java rename to app/src/main/java/com/imangazalievm/bubbble/data/repositories/UsersRepositoryImpl.java index b006009..b5ac95f 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/data/repository/UsersRepositoryImpl.java +++ b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/UsersRepositoryImpl.java @@ -1,8 +1,8 @@ -package com.imangazalievm.bubbble.data.repository; +package com.imangazalievm.bubbble.data.repositories; import com.imangazalievm.bubbble.data.network.DribbbleApiService; import com.imangazalievm.bubbble.domain.global.models.User; -import com.imangazalievm.bubbble.domain.global.repository.UsersRepository; +import com.imangazalievm.bubbble.domain.global.repositories.UsersRepository; import javax.inject.Inject; diff --git a/app/src/main/java/com/imangazalievm/bubbble/data/repository/datasource/DribbbleSearchDataSource.java b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/datasource/DribbbleSearchDataSource.java similarity index 98% rename from app/src/main/java/com/imangazalievm/bubbble/data/repository/datasource/DribbbleSearchDataSource.java rename to app/src/main/java/com/imangazalievm/bubbble/data/repositories/datasource/DribbbleSearchDataSource.java index a68cef8..6af6c36 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/data/repository/datasource/DribbbleSearchDataSource.java +++ b/app/src/main/java/com/imangazalievm/bubbble/data/repositories/datasource/DribbbleSearchDataSource.java @@ -1,4 +1,4 @@ -package com.imangazalievm.bubbble.data.repository.datasource; +package com.imangazalievm.bubbble.data.repositories.datasource; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/imangazalievm/bubbble/di/global/ApplicationComponent.java b/app/src/main/java/com/imangazalievm/bubbble/di/global/ApplicationComponent.java index b329725..dfe6dcf 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/di/global/ApplicationComponent.java +++ b/app/src/main/java/com/imangazalievm/bubbble/di/global/ApplicationComponent.java @@ -1,11 +1,11 @@ package com.imangazalievm.bubbble.di.global; import com.imangazalievm.bubbble.di.modules.OkHttpInterceptorsModule; -import com.imangazalievm.bubbble.domain.global.repository.CommentsRepository; -import com.imangazalievm.bubbble.domain.global.repository.FollowersRepository; -import com.imangazalievm.bubbble.domain.global.repository.ImagesRepository; -import com.imangazalievm.bubbble.domain.global.repository.ShotsRepository; -import com.imangazalievm.bubbble.domain.global.repository.UsersRepository; +import com.imangazalievm.bubbble.domain.global.repositories.CommentsRepository; +import com.imangazalievm.bubbble.domain.global.repositories.FollowersRepository; +import com.imangazalievm.bubbble.domain.global.repositories.ImagesRepository; +import com.imangazalievm.bubbble.domain.global.repositories.ShotsRepository; +import com.imangazalievm.bubbble.domain.global.repositories.UsersRepository; import javax.inject.Singleton; diff --git a/app/src/main/java/com/imangazalievm/bubbble/di/global/DataModule.java b/app/src/main/java/com/imangazalievm/bubbble/di/global/DataModule.java index 47564b9..2d408dd 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/di/global/DataModule.java +++ b/app/src/main/java/com/imangazalievm/bubbble/di/global/DataModule.java @@ -12,21 +12,21 @@ import com.imangazalievm.bubbble.data.network.NetworkChecker; import com.imangazalievm.bubbble.data.network.interceptors.DribbbleTokenInterceptor; import com.imangazalievm.bubbble.data.network.interceptors.NetworkCheckInterceptor; -import com.imangazalievm.bubbble.data.repository.CommentsRepositoryImpl; -import com.imangazalievm.bubbble.data.repository.FollowersRepositoryImpl; -import com.imangazalievm.bubbble.data.repository.ImagesRepositoryImpl; -import com.imangazalievm.bubbble.data.repository.ShotsRepositoryImpl; -import com.imangazalievm.bubbble.data.repository.TempPreferencesImpl; -import com.imangazalievm.bubbble.data.repository.UsersRepositoryImpl; -import com.imangazalievm.bubbble.data.repository.datasource.DribbbleSearchDataSource; +import com.imangazalievm.bubbble.data.repositories.CommentsRepositoryImpl; +import com.imangazalievm.bubbble.data.repositories.FollowersRepositoryImpl; +import com.imangazalievm.bubbble.data.repositories.ImagesRepositoryImpl; +import com.imangazalievm.bubbble.data.repositories.ShotsRepositoryImpl; +import com.imangazalievm.bubbble.data.repositories.TempPreferencesImpl; +import com.imangazalievm.bubbble.data.repositories.UsersRepositoryImpl; +import com.imangazalievm.bubbble.data.repositories.datasource.DribbbleSearchDataSource; import com.imangazalievm.bubbble.di.global.qualifiers.OkHttpInterceptors; import com.imangazalievm.bubbble.di.global.qualifiers.OkHttpNetworkInterceptors; -import com.imangazalievm.bubbble.domain.global.repository.CommentsRepository; -import com.imangazalievm.bubbble.domain.global.repository.FollowersRepository; -import com.imangazalievm.bubbble.domain.global.repository.ImagesRepository; -import com.imangazalievm.bubbble.domain.global.repository.ShotsRepository; -import com.imangazalievm.bubbble.domain.global.repository.TempPreferences; -import com.imangazalievm.bubbble.domain.global.repository.UsersRepository; +import com.imangazalievm.bubbble.domain.global.repositories.CommentsRepository; +import com.imangazalievm.bubbble.domain.global.repositories.FollowersRepository; +import com.imangazalievm.bubbble.domain.global.repositories.ImagesRepository; +import com.imangazalievm.bubbble.domain.global.repositories.ShotsRepository; +import com.imangazalievm.bubbble.domain.global.repositories.TempPreferences; +import com.imangazalievm.bubbble.domain.global.repositories.UsersRepository; import java.util.List; diff --git a/app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/CommentsRepository.java b/app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/CommentsRepository.java similarity index 83% rename from app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/CommentsRepository.java rename to app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/CommentsRepository.java index 3be2c9d..41a5989 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/CommentsRepository.java +++ b/app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/CommentsRepository.java @@ -1,4 +1,4 @@ -package com.imangazalievm.bubbble.domain.global.repository; +package com.imangazalievm.bubbble.domain.global.repositories; import com.imangazalievm.bubbble.domain.global.models.Comment; diff --git a/app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/FollowersRepository.java b/app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/FollowersRepository.java similarity index 84% rename from app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/FollowersRepository.java rename to app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/FollowersRepository.java index b0692af..6562911 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/FollowersRepository.java +++ b/app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/FollowersRepository.java @@ -1,4 +1,4 @@ -package com.imangazalievm.bubbble.domain.global.repository; +package com.imangazalievm.bubbble.domain.global.repositories; import com.imangazalievm.bubbble.domain.global.models.Follow; diff --git a/app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/ImagesRepository.java b/app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/ImagesRepository.java similarity index 66% rename from app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/ImagesRepository.java rename to app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/ImagesRepository.java index 247897f..f8a6630 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/ImagesRepository.java +++ b/app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/ImagesRepository.java @@ -1,4 +1,4 @@ -package com.imangazalievm.bubbble.domain.global.repository; +package com.imangazalievm.bubbble.domain.global.repositories; import io.reactivex.Completable; diff --git a/app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/ShotsRepository.java b/app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/ShotsRepository.java similarity index 91% rename from app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/ShotsRepository.java rename to app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/ShotsRepository.java index 74824b5..d863ded 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/ShotsRepository.java +++ b/app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/ShotsRepository.java @@ -1,4 +1,4 @@ -package com.imangazalievm.bubbble.domain.global.repository; +package com.imangazalievm.bubbble.domain.global.repositories; import com.imangazalievm.bubbble.domain.global.models.Shot; diff --git a/app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/TempDataRepository.java b/app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/TempDataRepository.java similarity index 77% rename from app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/TempDataRepository.java rename to app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/TempDataRepository.java index 951fb29..e676197 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/TempDataRepository.java +++ b/app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/TempDataRepository.java @@ -1,4 +1,4 @@ -package com.imangazalievm.bubbble.domain.global.repository; +package com.imangazalievm.bubbble.domain.global.repositories; import io.reactivex.Completable; diff --git a/app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/TempPreferences.java b/app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/TempPreferences.java similarity index 76% rename from app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/TempPreferences.java rename to app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/TempPreferences.java index 725777f..40132fd 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/TempPreferences.java +++ b/app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/TempPreferences.java @@ -1,4 +1,4 @@ -package com.imangazalievm.bubbble.domain.global.repository; +package com.imangazalievm.bubbble.domain.global.repositories; import io.reactivex.Completable; diff --git a/app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/UsersRepository.java b/app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/UsersRepository.java similarity index 73% rename from app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/UsersRepository.java rename to app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/UsersRepository.java index 8356897..005d3bc 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/domain/global/repository/UsersRepository.java +++ b/app/src/main/java/com/imangazalievm/bubbble/domain/global/repositories/UsersRepository.java @@ -1,4 +1,4 @@ -package com.imangazalievm.bubbble.domain.global.repository; +package com.imangazalievm.bubbble.domain.global.repositories; import com.imangazalievm.bubbble.domain.global.models.User; diff --git a/app/src/main/java/com/imangazalievm/bubbble/domain/shotdetails/ShotDetailsInteractor.java b/app/src/main/java/com/imangazalievm/bubbble/domain/shotdetails/ShotDetailsInteractor.java index 8eb190d..315dcbf 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/domain/shotdetails/ShotDetailsInteractor.java +++ b/app/src/main/java/com/imangazalievm/bubbble/domain/shotdetails/ShotDetailsInteractor.java @@ -4,9 +4,9 @@ import com.imangazalievm.bubbble.domain.global.models.Comment; import com.imangazalievm.bubbble.domain.global.models.Shot; import com.imangazalievm.bubbble.domain.global.models.ShotCommentsRequestParams; -import com.imangazalievm.bubbble.domain.global.repository.CommentsRepository; -import com.imangazalievm.bubbble.domain.global.repository.ImagesRepository; -import com.imangazalievm.bubbble.domain.global.repository.ShotsRepository; +import com.imangazalievm.bubbble.domain.global.repositories.CommentsRepository; +import com.imangazalievm.bubbble.domain.global.repositories.ImagesRepository; +import com.imangazalievm.bubbble.domain.global.repositories.ShotsRepository; import com.imangazalievm.bubbble.presentation.mvp.global.SchedulersProvider; import java.util.List; diff --git a/app/src/main/java/com/imangazalievm/bubbble/domain/shotslist/ShotsInteractor.java b/app/src/main/java/com/imangazalievm/bubbble/domain/shotslist/ShotsInteractor.java index 0c0c04b..ad05e5c 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/domain/shotslist/ShotsInteractor.java +++ b/app/src/main/java/com/imangazalievm/bubbble/domain/shotslist/ShotsInteractor.java @@ -3,7 +3,7 @@ import com.imangazalievm.bubbble.domain.global.models.Shot; import com.imangazalievm.bubbble.domain.global.models.ShotsRequestParams; -import com.imangazalievm.bubbble.domain.global.repository.ShotsRepository; +import com.imangazalievm.bubbble.domain.global.repositories.ShotsRepository; import com.imangazalievm.bubbble.presentation.mvp.global.SchedulersProvider; import java.util.List; diff --git a/app/src/main/java/com/imangazalievm/bubbble/domain/shotssearch/ShotsSearchInteractor.java b/app/src/main/java/com/imangazalievm/bubbble/domain/shotssearch/ShotsSearchInteractor.java index a0bbaea..4a5a7a5 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/domain/shotssearch/ShotsSearchInteractor.java +++ b/app/src/main/java/com/imangazalievm/bubbble/domain/shotssearch/ShotsSearchInteractor.java @@ -3,7 +3,7 @@ import com.imangazalievm.bubbble.domain.global.models.Shot; import com.imangazalievm.bubbble.domain.global.models.ShotsSearchRequestParams; -import com.imangazalievm.bubbble.domain.global.repository.ShotsRepository; +import com.imangazalievm.bubbble.domain.global.repositories.ShotsRepository; import com.imangazalievm.bubbble.presentation.mvp.global.SchedulersProvider; import java.util.List; diff --git a/app/src/main/java/com/imangazalievm/bubbble/domain/shotzoom/ShotZoomInteractor.java b/app/src/main/java/com/imangazalievm/bubbble/domain/shotzoom/ShotZoomInteractor.java index 186696b..397c54b 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/domain/shotzoom/ShotZoomInteractor.java +++ b/app/src/main/java/com/imangazalievm/bubbble/domain/shotzoom/ShotZoomInteractor.java @@ -1,7 +1,7 @@ package com.imangazalievm.bubbble.domain.shotzoom; -import com.imangazalievm.bubbble.domain.global.repository.ImagesRepository; +import com.imangazalievm.bubbble.domain.global.repositories.ImagesRepository; import com.imangazalievm.bubbble.presentation.mvp.global.SchedulersProvider; import javax.inject.Inject; diff --git a/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserDetailsInteractor.java b/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserDetailsInteractor.java index a60765f..6148ddd 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserDetailsInteractor.java +++ b/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserDetailsInteractor.java @@ -2,7 +2,7 @@ import com.imangazalievm.bubbble.domain.global.models.User; -import com.imangazalievm.bubbble.domain.global.repository.UsersRepository; +import com.imangazalievm.bubbble.domain.global.repositories.UsersRepository; import com.imangazalievm.bubbble.presentation.mvp.global.SchedulersProvider; import javax.inject.Inject; diff --git a/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserFollowersInteractor.java b/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserFollowersInteractor.java index 10069fd..b025ae4 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserFollowersInteractor.java +++ b/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserFollowersInteractor.java @@ -3,7 +3,7 @@ import com.imangazalievm.bubbble.domain.global.models.Follow; import com.imangazalievm.bubbble.domain.global.models.UserFollowersRequestParams; -import com.imangazalievm.bubbble.domain.global.repository.FollowersRepository; +import com.imangazalievm.bubbble.domain.global.repositories.FollowersRepository; import com.imangazalievm.bubbble.presentation.mvp.global.SchedulersProvider; import java.util.List; diff --git a/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserProfileInteractor.java b/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserProfileInteractor.java index bcd2cb4..4782dcb 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserProfileInteractor.java +++ b/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserProfileInteractor.java @@ -2,7 +2,7 @@ import com.imangazalievm.bubbble.domain.global.models.User; -import com.imangazalievm.bubbble.domain.global.repository.UsersRepository; +import com.imangazalievm.bubbble.domain.global.repositories.UsersRepository; import com.imangazalievm.bubbble.presentation.mvp.global.SchedulersProvider; import javax.inject.Inject; diff --git a/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserShotsInteractor.java b/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserShotsInteractor.java index 780d51a..ebca2ec 100644 --- a/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserShotsInteractor.java +++ b/app/src/main/java/com/imangazalievm/bubbble/domain/userprofile/UserShotsInteractor.java @@ -4,8 +4,8 @@ import com.imangazalievm.bubbble.domain.global.models.Shot; import com.imangazalievm.bubbble.domain.global.models.User; import com.imangazalievm.bubbble.domain.global.models.UserShotsRequestParams; -import com.imangazalievm.bubbble.domain.global.repository.ShotsRepository; -import com.imangazalievm.bubbble.domain.global.repository.UsersRepository; +import com.imangazalievm.bubbble.domain.global.repositories.ShotsRepository; +import com.imangazalievm.bubbble.domain.global.repositories.UsersRepository; import com.imangazalievm.bubbble.presentation.mvp.global.SchedulersProvider; import java.util.List; diff --git a/app/src/unitTests/java/com/imangazalievm/bubbble/di/TestApplicationComponent.java b/app/src/unitTests/java/com/imangazalievm/bubbble/di/TestApplicationComponent.java deleted file mode 100644 index 9c59d9d..0000000 --- a/app/src/unitTests/java/com/imangazalievm/bubbble/di/TestApplicationComponent.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.imangazalievm.bubbble.di; - -import com.imangazalievm.bubbble.di.global.ApplicationComponent; -import com.imangazalievm.bubbble.di.modules.OkHttpInterceptorsModule; -import com.imangazalievm.bubbble.di.modules.TestApplicationModule; -import com.imangazalievm.bubbble.domain.global.repository.CommentsRepository; -import com.imangazalievm.bubbble.domain.global.repository.FollowersRepository; -import com.imangazalievm.bubbble.domain.global.repository.ImagesRepository; -import com.imangazalievm.bubbble.domain.global.repository.ShotsRepository; -import com.imangazalievm.bubbble.domain.global.repository.UsersRepository; - -import javax.inject.Singleton; - -import dagger.Component; - -@Singleton -@Component(modules = {TestApplicationModule.class, TestApplicationModule.class, OkHttpInterceptorsModule.class}) -public interface TestApplicationComponent extends ApplicationComponent { - - ShotsRepository provideBookRepository(); - - CommentsRepository provideCommentsRepository(); - - UsersRepository provideUsersRepository(); - - FollowersRepository provideFollowersRepository(); - - ImagesRepository provideImagesRepository(); - -} diff --git a/app/src/unitTests/java/com/imangazalievm/bubbble/di/modules/TestApplicationModule.java b/app/src/unitTests/java/com/imangazalievm/bubbble/di/modules/TestApplicationModule.java deleted file mode 100644 index b7fd6ec..0000000 --- a/app/src/unitTests/java/com/imangazalievm/bubbble/di/modules/TestApplicationModule.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.imangazalievm.bubbble.di.modules; - -import android.content.Context; - -import javax.inject.Singleton; - -import dagger.Module; -import dagger.Provides; - -@Module -public class TestApplicationModule { - - private final Context context; - - public TestApplicationModule(Context context) { - this.context = context.getApplicationContext(); - } - - @Provides - @Singleton - Context provideApplicationContext() { - return context; - } - -} diff --git a/app/src/unitTests/java/com/imangazalievm/bubbble/di/modules/TestDataModule.java b/app/src/unitTests/java/com/imangazalievm/bubbble/di/modules/TestDataModule.java deleted file mode 100644 index d6b287f..0000000 --- a/app/src/unitTests/java/com/imangazalievm/bubbble/di/modules/TestDataModule.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.imangazalievm.bubbble.di.modules; - -import android.support.annotation.NonNull; - -import com.google.gson.FieldNamingPolicy; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.imangazalievm.bubbble.BuildConfig; -import com.imangazalievm.bubbble.data.network.DribbbleApiService; -import com.imangazalievm.bubbble.data.network.ErrorHandler; -import com.imangazalievm.bubbble.data.network.NetworkChecker; -import com.imangazalievm.bubbble.data.network.interceptors.DribbbleTokenInterceptor; -import com.imangazalievm.bubbble.data.network.interceptors.NetworkCheckInterceptor; -import com.imangazalievm.bubbble.data.repository.CommentsRepositoryImpl; -import com.imangazalievm.bubbble.data.repository.FollowersRepositoryImpl; -import com.imangazalievm.bubbble.data.repository.ImagesRepositoryImpl; -import com.imangazalievm.bubbble.data.repository.ShotsRepositoryImpl; -import com.imangazalievm.bubbble.data.repository.UsersRepositoryImpl; -import com.imangazalievm.bubbble.di.global.qualifiers.OkHttpInterceptors; -import com.imangazalievm.bubbble.di.global.qualifiers.OkHttpNetworkInterceptors; -import com.imangazalievm.bubbble.domain.global.repository.CommentsRepository; -import com.imangazalievm.bubbble.domain.global.repository.FollowersRepository; -import com.imangazalievm.bubbble.domain.global.repository.ImagesRepository; -import com.imangazalievm.bubbble.domain.global.repository.ShotsRepository; -import com.imangazalievm.bubbble.domain.global.repository.UsersRepository; - -import java.util.List; - -import javax.inject.Singleton; - -import dagger.Module; -import dagger.Provides; -import okhttp3.Interceptor; -import okhttp3.OkHttpClient; -import retrofit2.Retrofit; -import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; -import retrofit2.converter.gson.GsonConverterFactory; - -@Module -public class TestDataModule { - - private final String baseUrl; - - public TestDataModule(String baseUrl) { - this.baseUrl = baseUrl; - } - - @Provides - @Singleton - ShotsRepository provideBookRepository(ShotsRepositoryImpl bookRepository) { - return bookRepository; - } - - @Provides - @Singleton - CommentsRepository provideCommentsRepository(CommentsRepositoryImpl commentsRepository) { - return commentsRepository; - } - - @Provides - @Singleton - UsersRepository provideUsersRepository(UsersRepositoryImpl usersRepository) { - return usersRepository; - } - - @Provides - @Singleton - FollowersRepository provideFollowersRepository(FollowersRepositoryImpl followersRepository) { - return followersRepository; - } - - @Provides - @Singleton - ImagesRepository provideImagesRepository(ImagesRepositoryImpl imagesRepository) { - return imagesRepository; - } - - @Provides - @NonNull - @Singleton - public OkHttpClient provideOkHttpClient(NetworkChecker networkChecker, - @OkHttpInterceptors @NonNull List interceptors, - @OkHttpNetworkInterceptors @NonNull List networkInterceptors) { - final OkHttpClient.Builder okHttpBuilder = new OkHttpClient.Builder(); - okHttpBuilder.addInterceptor(new NetworkCheckInterceptor(networkChecker)); - okHttpBuilder.addInterceptor(new DribbbleTokenInterceptor(BuildConfig.DRIBBBLE_CLIENT_ACCESS_TOKEN)); - - for (Interceptor interceptor : interceptors) { - okHttpBuilder.addInterceptor(interceptor); - } - - for (Interceptor networkInterceptor : networkInterceptors) { - okHttpBuilder.addNetworkInterceptor(networkInterceptor); - } - - return okHttpBuilder.build(); - } - - @Provides - @Singleton - Retrofit provideRetrofit(OkHttpClient okHttpClient) { - Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create(); - return new Retrofit.Builder() - .client(okHttpClient) - .addConverterFactory(GsonConverterFactory.create(gson)) - .addCallAdapterFactory(RxJava2CallAdapterFactory.create()) - .baseUrl(baseUrl) - .build(); - } - - @Provides - @Singleton - Gson provideGson() { - return new Gson(); - } - - @Provides - @Singleton - ErrorHandler provideErrorHandler(Gson gson) { - return new ErrorHandler(gson); - } - - @Provides - @Singleton - DribbbleApiService provideApi(Retrofit retrofit) { - return retrofit.create(DribbbleApiService.class); - } - -} diff --git a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/MainPresenterTest.java b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/MainPresenterTest.java index 6bd22b4..26948f5 100644 --- a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/MainPresenterTest.java +++ b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/MainPresenterTest.java @@ -1,7 +1,7 @@ package com.imangazalievm.bubbble.presentation.mvp.presenters; import com.imangazalievm.bubbble.presentation.mvp.main.MainPresenter; -import com.imangazalievm.bubbble.presentation.mvp.views.MainView$$State; +import com.imangazalievm.bubbble.presentation.mvp.main.MainView; import com.imangazalievm.bubbble.test.BubbbleTestRunner; import org.junit.Before; @@ -16,7 +16,7 @@ public class MainPresenterTest { @Mock - private MainView$$State view; + private MainView view; private MainPresenter presenter; @Before diff --git a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotDetailsPresenterTest.java b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotDetailsPresenterTest.java index 652f530..0fd95cc 100644 --- a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotDetailsPresenterTest.java +++ b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotDetailsPresenterTest.java @@ -7,6 +7,7 @@ import com.imangazalievm.bubbble.domain.global.models.Shot; import com.imangazalievm.bubbble.domain.global.models.ShotCommentsRequestParams; import com.imangazalievm.bubbble.domain.global.models.User; +import com.imangazalievm.bubbble.presentation.mvp.global.SchedulersProvider; import com.imangazalievm.bubbble.presentation.mvp.global.permissions.Permission; import com.imangazalievm.bubbble.presentation.mvp.global.permissions.PermissionRequestListener; import com.imangazalievm.bubbble.presentation.mvp.global.permissions.PermissionResult; @@ -14,7 +15,6 @@ import com.imangazalievm.bubbble.presentation.mvp.shotdetails.ShotDetailsPresenter; import com.imangazalievm.bubbble.presentation.mvp.shotdetails.ShotDetailsView; import com.imangazalievm.bubbble.test.BubbbleTestRunner; -import com.imangazalievm.bubbble.test.TestSchedulerProvider; import org.junit.Before; import org.junit.Test; @@ -59,7 +59,7 @@ public class ShotDetailsPresenterTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - presenter = new ShotDetailsPresenter(interactor, new TestSchedulerProvider(), TEST_SHOT_ID); + presenter = new ShotDetailsPresenter(interactor, new SchedulersProvider(), TEST_SHOT_ID); presenter.setPermissionsManager(permissionsManagerMock); } diff --git a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotZoomPresenterTest.java b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotZoomPresenterTest.java index b9d2599..4a69a14 100644 --- a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotZoomPresenterTest.java +++ b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotZoomPresenterTest.java @@ -9,7 +9,7 @@ import com.imangazalievm.bubbble.presentation.mvp.shotzoom.ShotZoomPresenter; import com.imangazalievm.bubbble.presentation.mvp.shotzoom.ShotZoomView; import com.imangazalievm.bubbble.test.BubbbleTestRunner; -import com.imangazalievm.bubbble.test.TestSchedulerProvider; +import com.imangazalievm.bubbble.test.TestSchedulersProvider; import org.junit.Before; import org.junit.Test; @@ -45,7 +45,7 @@ public class ShotZoomPresenterTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - presenter = new ShotZoomPresenter(interactor, new TestSchedulerProvider(), + presenter = new ShotZoomPresenter(interactor, new TestSchedulersProvider(), TEST_SHOT_TITLE, TEST_SHOT_URL, TEST_SHOT_IMAGE_URL); presenter.setPermissionsManager(permissionsManager); } diff --git a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotsPresenterTest.java b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotsPresenterTest.java index c954180..0d5aa06 100644 --- a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotsPresenterTest.java +++ b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotsPresenterTest.java @@ -7,7 +7,7 @@ import com.imangazalievm.bubbble.presentation.mvp.shotslist.ShotsPresenter; import com.imangazalievm.bubbble.presentation.mvp.shotslist.ShotsView; import com.imangazalievm.bubbble.test.BubbbleTestRunner; -import com.imangazalievm.bubbble.test.TestSchedulerProvider; +import com.imangazalievm.bubbble.test.TestSchedulersProvider; import org.junit.Before; import org.junit.Test; @@ -41,7 +41,7 @@ public class ShotsPresenterTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - presenter = new ShotsPresenter(interactor, new TestSchedulerProvider(), TEST_SORT_TYPE); + presenter = new ShotsPresenter(interactor, new TestSchedulersProvider(), TEST_SORT_TYPE); } @Test diff --git a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotsSearchPresenterTest.java b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotsSearchPresenterTest.java index fabe9d4..c3c90c3 100644 --- a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotsSearchPresenterTest.java +++ b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/ShotsSearchPresenterTest.java @@ -7,7 +7,7 @@ import com.imangazalievm.bubbble.presentation.mvp.shotssearch.ShotsSearchPresenter; import com.imangazalievm.bubbble.presentation.mvp.shotssearch.ShotsSearchView; import com.imangazalievm.bubbble.test.BubbbleTestRunner; -import com.imangazalievm.bubbble.test.TestSchedulerProvider; +import com.imangazalievm.bubbble.test.TestSchedulersProvider; import org.junit.Before; import org.junit.Test; @@ -41,7 +41,7 @@ public class ShotsSearchPresenterTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - presenter = new ShotsSearchPresenter(interactor, new TestSchedulerProvider(), TEST_SEARCH_REQUEST); + presenter = new ShotsSearchPresenter(interactor, new TestSchedulersProvider(), TEST_SEARCH_REQUEST); } @Test diff --git a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserDetailsPresenterTest.java b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserDetailsPresenterTest.java index 7e8c88f..7c6a69b 100644 --- a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserDetailsPresenterTest.java +++ b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserDetailsPresenterTest.java @@ -7,7 +7,7 @@ import com.imangazalievm.bubbble.presentation.mvp.userprofile.UserDetailsPresenter; import com.imangazalievm.bubbble.presentation.mvp.userprofile.UserDetailsView; import com.imangazalievm.bubbble.test.BubbbleTestRunner; -import com.imangazalievm.bubbble.test.TestSchedulerProvider; +import com.imangazalievm.bubbble.test.TestSchedulersProvider; import org.junit.Before; import org.junit.Test; @@ -36,7 +36,7 @@ public class UserDetailsPresenterTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - presenter = new UserDetailsPresenter(interactor, new TestSchedulerProvider(), TEST_USER_ID); + presenter = new UserDetailsPresenter(interactor, new TestSchedulersProvider(), TEST_USER_ID); } @Test diff --git a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserFollowersPresenterTest.java b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserFollowersPresenterTest.java index c58aa58..460d1a4 100644 --- a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserFollowersPresenterTest.java +++ b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserFollowersPresenterTest.java @@ -8,7 +8,7 @@ import com.imangazalievm.bubbble.presentation.mvp.userprofile.UserFollowersPresenter; import com.imangazalievm.bubbble.presentation.mvp.userprofile.UserFollowersView; import com.imangazalievm.bubbble.test.BubbbleTestRunner; -import com.imangazalievm.bubbble.test.TestSchedulerProvider; +import com.imangazalievm.bubbble.test.TestSchedulersProvider; import org.junit.Before; import org.junit.Test; @@ -43,7 +43,7 @@ public class UserFollowersPresenterTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - presenter = new UserFollowersPresenter(interactor, new TestSchedulerProvider(), TEST_USER_ID); + presenter = new UserFollowersPresenter(interactor, new TestSchedulersProvider(), TEST_USER_ID); } @Test diff --git a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserProfilePresenterTest.java b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserProfilePresenterTest.java index fce2778..520e8dd 100644 --- a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserProfilePresenterTest.java +++ b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserProfilePresenterTest.java @@ -6,7 +6,7 @@ import com.imangazalievm.bubbble.presentation.mvp.userprofile.UserProfilePresenter; import com.imangazalievm.bubbble.presentation.mvp.userprofile.UserProfileView; import com.imangazalievm.bubbble.test.BubbbleTestRunner; -import com.imangazalievm.bubbble.test.TestSchedulerProvider; +import com.imangazalievm.bubbble.test.TestSchedulersProvider; import org.junit.Before; import org.junit.Test; @@ -36,7 +36,7 @@ public class UserProfilePresenterTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - presenter = new UserProfilePresenter(interactor, new TestSchedulerProvider(), TEST_USER_ID); + presenter = new UserProfilePresenter(interactor, new TestSchedulersProvider(), TEST_USER_ID); } @Test diff --git a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserShotsPresenterTest.java b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserShotsPresenterTest.java index 6a7739a..b0cdc7b 100644 --- a/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserShotsPresenterTest.java +++ b/app/src/unitTests/java/com/imangazalievm/bubbble/presentation/mvp/presenters/UserShotsPresenterTest.java @@ -7,7 +7,7 @@ import com.imangazalievm.bubbble.presentation.mvp.userprofile.UserShotsPresenter; import com.imangazalievm.bubbble.presentation.mvp.userprofile.UserShotsView; import com.imangazalievm.bubbble.test.BubbbleTestRunner; -import com.imangazalievm.bubbble.test.TestSchedulerProvider; +import com.imangazalievm.bubbble.test.TestSchedulersProvider; import org.junit.Before; import org.junit.Test; @@ -41,7 +41,7 @@ public class UserShotsPresenterTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - presenter = new UserShotsPresenter(interactor, new TestSchedulerProvider(), TEST_USER_ID); + presenter = new UserShotsPresenter(interactor, new TestSchedulersProvider(), TEST_USER_ID); } @Test diff --git a/app/src/unitTests/java/com/imangazalievm/bubbble/test/TestSchedulerProvider.java b/app/src/unitTests/java/com/imangazalievm/bubbble/test/TestSchedulersProvider.java similarity index 88% rename from app/src/unitTests/java/com/imangazalievm/bubbble/test/TestSchedulerProvider.java rename to app/src/unitTests/java/com/imangazalievm/bubbble/test/TestSchedulersProvider.java index 776460a..9eaf8e7 100644 --- a/app/src/unitTests/java/com/imangazalievm/bubbble/test/TestSchedulerProvider.java +++ b/app/src/unitTests/java/com/imangazalievm/bubbble/test/TestSchedulersProvider.java @@ -5,7 +5,7 @@ import io.reactivex.Scheduler; import io.reactivex.schedulers.Schedulers; -public class TestSchedulerProvider extends SchedulersProvider { +public class TestSchedulersProvider extends SchedulersProvider { @Override public Scheduler computation() { diff --git a/gradle.properties b/gradle.properties index ef33798..c9f8d0d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,6 +17,6 @@ org.gradle.jvmargs=-Xmx1536m # org.gradle.parallel=true # Dribbble API -dribbble_client_id = c117ac7d45714d9692ebf30ee86508d63dce4397795cedefa7e71dd01128fda4 -dribbble_client_secret = 76d0e42be06af047e8d7b59c0714c203517622000530e9d12448adef8225d794 -dribbble_client_access_token = 22bf8ba0affd9ac65b3976930b20460f554a246d2789b3a85f04c114def47204 \ No newline at end of file +dribbble_client_id = +dribbble_client_secret = +dribbble_client_access_token = \ No newline at end of file