Merge pull request #963 from StepicOrg/feature/APPS_3635_add_kaspresso

rostikjoystick · web-flow · commit a962f2a18779 · 2022-03-31T14:54:09.000+03:00
APPS-3635: Add Kaspresso
diff --git a/app/build.gradle b/app/build.gradle
@@ -215,7 +215,6 @@ dependencies {
     implementation libraries.firebaseAppindexing
     implementation libraries.googleauth
     implementation libraries.firebaseConfig
-    implementation libraries.firebasePerf
 
 //    implementation libraries.facebookSdk
     implementation libraries.vkSdk
@@ -256,6 +255,8 @@ dependencies {
     androidTestImplementation libraries.espressoCore
     androidTestImplementation libraries.espressoContrib
     androidTestImplementation libraries.espressoIntents
+    androidTestImplementation libraries.kaspresso
+    androidTestImplementation libraries.kaspressoAllure
 
     debugImplementation libraries.soloader
     debugImplementation libraries.flipperCore
@@ -277,5 +278,4 @@ afterEvaluate {
 apply plugin: 'com.google.gms.google-services'
 if (getGradle().getStartParameter().getTaskRequests().toString().contains("Release")) {
     apply plugin: 'com.getkeepsafe.dexcount'
-}
-apply plugin: 'com.google.firebase.firebase-perf'
+}
diff --git a/app/src/androidTest/java/org/stepik/android/view/auth/ui/activity/AuthSampleTest.kt b/app/src/androidTest/java/org/stepik/android/view/auth/ui/activity/AuthSampleTest.kt
@@ -0,0 +1,34 @@
+package org.stepik.android.view.auth.ui.activity
+
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import com.kaspersky.kaspresso.testcases.api.testcase.TestCase
+import org.junit.Rule
+import org.junit.Test
+
+class AuthSampleTest : TestCase() {
+    @get:Rule
+    val activityTestRule = ActivityScenarioRule(SocialAuthActivity::class.java)
+
+    @Test
+    fun test() =
+        run {
+            step("Open Social Auth Screen") {
+                testLogger.d("I am testLogger")
+                SocialAuthScreen {
+                    signInWithEmailButton {
+                        isVisible()
+                        click()
+                    }
+                }
+            }
+
+            step("Open Credential Auth Screen") {
+                CredentialAuthScreen {
+                    loginField.isVisible()
+                    loginField.typeText("test@stepik.org")
+                    passwordField.typeText("stepikthebest")
+                    loginField.hasText("test@stepik.org")
+                }
+            }
+        }
+}
diff --git a/app/src/androidTest/java/org/stepik/android/view/auth/ui/activity/CredentialAuthScreen.kt b/app/src/androidTest/java/org/stepik/android/view/auth/ui/activity/CredentialAuthScreen.kt
@@ -0,0 +1,14 @@
+package org.stepik.android.view.auth.ui.activity
+
+import org.stepic.droid.R
+import com.kaspersky.kaspresso.screens.KScreen
+import io.github.kakaocup.kakao.edit.KEditText
+
+object CredentialAuthScreen : KScreen<CredentialAuthScreen>() {
+    override val layoutId: Int = R.layout.activity_auth_credential
+    override val viewClass: Class<*> = CredentialAuthActivity::class.java
+
+    val loginField = KEditText { withId(R.id.loginField) }
+    val passwordField = KEditText { withId(R.id.passwordField) }
+
+}
diff --git a/app/src/androidTest/java/org/stepik/android/view/auth/ui/activity/SocialAuthScreen.kt b/app/src/androidTest/java/org/stepik/android/view/auth/ui/activity/SocialAuthScreen.kt
@@ -0,0 +1,13 @@
+package org.stepik.android.view.auth.ui.activity
+
+import com.kaspersky.kaspresso.screens.KScreen
+import io.github.kakaocup.kakao.text.KButton
+import org.stepic.droid.R
+
+object SocialAuthScreen : KScreen<SocialAuthScreen>() {
+
+    override val layoutId: Int = R.layout.activity_auth_social
+    override val viewClass: Class<*> = SocialAuthActivity::class.java
+
+    val signInWithEmailButton = KButton { withId(R.id.signInWithEmail) }
+}
diff --git a/app/src/main/java/org/stepic/droid/analytic/Analytic.java b/app/src/main/java/org/stepic/droid/analytic/Analytic.java
@@ -337,11 +337,6 @@ interface Params {
         }
     }
 
-    interface Traces {
-        String COURSE_CONTENT_LOADING = "course_content_loading";
-        String SPLASH_LOADING = "splash_loading";
-    }
-
     void reportEvent(String eventName, Bundle bundle);
 
     void reportEvent(String eventName, String id);
diff --git a/app/src/main/java/org/stepic/droid/core/presenters/SplashPresenter.kt b/app/src/main/java/org/stepic/droid/core/presenters/SplashPresenter.kt
@@ -2,7 +2,6 @@ package org.stepic.droid.core.presenters
 
 import android.content.res.Resources
 import com.google.android.gms.tasks.Tasks
-import com.google.firebase.perf.FirebasePerformance
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.google.firebase.remoteconfig.ktx.get
 import io.reactivex.Completable
@@ -32,7 +31,6 @@ import org.stepik.android.view.routing.deeplink.BranchDeepLinkParser
 import org.stepik.android.view.routing.deeplink.BranchRoute
 import org.stepik.android.view.splash.notification.RemindRegistrationNotificationDelegate
 import org.stepik.android.view.splash.notification.RetentionNotificationDelegate
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 @SplashScope
@@ -73,7 +71,6 @@ constructor(
     private var disposable: Disposable? = null
 
     fun onSplashCreated(referringParams: JSONObject? = null) {
-        val splashLoadingTrace = FirebasePerformance.startTrace(Analytic.Traces.SPLASH_LOADING)
         disposable = Completable
             .fromCallable {
                 countNumberOfLaunches()
@@ -94,9 +91,6 @@ constructor(
             .andThen(resolveSplashRoute(referringParams))
             .subscribeOn(backgroundScheduler)
             .observeOn(mainScheduler)
-            .doFinally {
-                splashLoadingTrace.stop()
-            }
             .subscribeBy(
                 onError = emptyOnErrorStub,
                 onSuccess = {
diff --git a/app/src/main/java/org/stepik/android/domain/course_content/interactor/CourseContentInteractor.kt b/app/src/main/java/org/stepik/android/domain/course_content/interactor/CourseContentInteractor.kt
@@ -1,15 +1,12 @@
 package org.stepik.android.domain.course_content.interactor
 
-import com.google.firebase.perf.FirebasePerformance
 import io.reactivex.Observable
 import io.reactivex.Single
 import io.reactivex.rxkotlin.Observables
 import io.reactivex.rxkotlin.Singles.zip
 import io.reactivex.rxkotlin.toObservable
 import io.reactivex.schedulers.Schedulers
 import io.reactivex.subjects.PublishSubject
-import org.stepic.droid.analytic.AmplitudeAnalytic
-import org.stepic.droid.analytic.Analytic
 import ru.nobird.app.core.model.mapToLongArray
 import org.stepic.droid.util.plus
 import org.stepik.android.domain.base.DataSourceType
@@ -74,21 +71,12 @@ constructor(
     private fun getEmptySections(course: Course): Observable<Pair<Course, List<CourseContentItem>>> =
         Observable.just(course to emptyList())
 
-    private fun getContent(course: Course, items: List<CourseContentItem>, dataSourceType: DataSourceType): Observable<Pair<Course, List<CourseContentItem>>> {
-        val courseContentLoadingTrace = FirebasePerformance.getInstance().newTrace(Analytic.Traces.COURSE_CONTENT_LOADING)
-        courseContentLoadingTrace.putAttribute(AmplitudeAnalytic.Course.Params.COURSE, course.id.toString())
-        courseContentLoadingTrace.putAttribute(AmplitudeAnalytic.Course.Params.SOURCE, dataSourceType.name)
-        courseContentLoadingTrace.start()
-
-        return getSectionsOfCourse(course, dataSourceType)
+    private fun getContent(course: Course, items: List<CourseContentItem>, dataSourceType: DataSourceType): Observable<Pair<Course, List<CourseContentItem>>> =
+        getSectionsOfCourse(course, dataSourceType)
             .flatMap { populateSections(course, it, items, dataSourceType) }
             .flatMapObservable { populatedItems ->
                 Observable.just(course to populatedItems) + loadUnits(course, populatedItems, dataSourceType)
             }
-            .doOnComplete {
-                courseContentLoadingTrace.stop()
-            }
-    }
 
     private fun getSectionsOfCourse(course: Course, dataSourceType: DataSourceType): Single<List<Section>> =
         sectionRepository
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,6 @@ buildscript {
         classpath gradlePlugins.android
         classpath gradlePlugins.googleServices
         classpath gradlePlugins.crashlyticsPlugin
-        classpath gradlePlugins.firebasePerfPlugin
         classpath gradlePlugins.kotlin
         classpath gradlePlugins.dexcount
     }
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -103,6 +103,7 @@ ext.versions = [
         hamcrest             : '2.1',
         espresso             : '3.1.0',
         testCore             : '1.1.1',
+        kaspresso            : '1.4.1',
 
         ktlint               : '0.34.2',
         ktlintRules          : '1.0.0',
@@ -241,6 +242,9 @@ ext.libraries = [
         espressoCore         : "androidx.test.espresso:espresso-core:$versions.espresso",
         espressoContrib      : "androidx.test.espresso:espresso-contrib:$versions.espresso",
         espressoIntents      : "androidx.test.espresso:espresso-intents:$versions.espresso",
+        kaspresso            : "com.kaspersky.android-components:kaspresso:$versions.kaspresso",
+        kaspressoAllure      : "com.kaspersky.android-components:kaspresso-allure-support:$versions.kaspresso",
+
 
         ktlint               : "com.pinterest:ktlint:$versions.ktlint",
         ktlintRules          : "ru.nobird.android.ktlint:rules:$versions.ktlintRules",

Original file line number	Diff line number	Diff line change
`@@ -337,11 +337,6 @@ interface Params {`
`337`	`337`	`}`
`338`	`338`	`}`
`339`	`339`
`340`		`- interface Traces {`
`341`		`- String COURSE_CONTENT_LOADING = "course_content_loading";`
`342`		`- String SPLASH_LOADING = "splash_loading";`
`343`		`- }`
`344`		`-`
`345`	`340`	`void reportEvent(String eventName, Bundle bundle);`
`346`	`341`
`347`	`342`	`void reportEvent(String eventName, String id);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ buildscript {`
`16`	`16`	`classpath gradlePlugins.android`
`17`	`17`	`classpath gradlePlugins.googleServices`
`18`	`18`	`classpath gradlePlugins.crashlyticsPlugin`
`19`		`- classpath gradlePlugins.firebasePerfPlugin`
`20`	`19`	`classpath gradlePlugins.kotlin`
`21`	`20`	`classpath gradlePlugins.dexcount`
`22`	`21`	`}`