Merge pull request #187 from embrace-io/move-func-tests

Move functional tests
embrace-io · Dec 15, 2023 · 0a9d88f · 0a9d88f
2 parents f834830 + 3fdee9b
commit 0a9d88f
Show file tree

Hide file tree

Showing 30 changed files with 16 additions and 568 deletions.
diff --git a/buildSrc/src/main/kotlin/io/embrace/gradle/InternalEmbracePlugin.kt b/buildSrc/src/main/kotlin/io/embrace/gradle/InternalEmbracePlugin.kt
@@ -22,9 +22,7 @@ class InternalEmbracePlugin : Plugin<Project> {
         configureBuildPlugins(project)
 
         // TODO: (future) - these scripts should be integrated into this class.
-        if (project.name != "test-server") { // don't want to release our test code...
-            project.apply(from = project.file("../scripts/release.gradle"))
-        }
+        project.apply(from = project.file("../scripts/release.gradle"))
 
         project.pluginManager.withPlugin("com.android.library") {
             val android = project.extensions.getByType(LibraryExtension::class.java)

diff --git a/embrace-android-sdk/build.gradle b/embrace-android-sdk/build.gradle
@@ -79,11 +79,6 @@ koverReport {
 }
 
 dependencies {
-    androidTestImplementation project(":test-server")
-    androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation "com.squareup.okhttp3:mockwebserver:4.9.3"
-    androidTestImplementation project(path: ":embrace-android-sdk")
-
     implementation "androidx.lifecycle:lifecycle-common-java8:2.5.0"
     implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
     implementation "com.google.code.gson:gson:2.9.0"
@@ -107,6 +102,17 @@ dependencies {
 
     dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:${Versions.dokka}")
     dokkaHtmlPlugin("org.jetbrains.dokka:android-documentation-plugin:${Versions.dokka}")
+
+    // For the functional tests
+    androidTestImplementation "androidx.test:core:1.4.0"
+    androidTestImplementation "androidx.test:runner:1.4.0"
+    androidTestImplementation "androidx.test:rules:1.4.0"
+    androidTestImplementation "androidx.test.ext:junit:1.1.3"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
+    androidTestImplementation "androidx.appcompat:appcompat:1.1.0"
+    androidTestImplementation "com.squareup.okhttp3:mockwebserver:4.9.3"
+    androidTestImplementation "androidx.test.ext:junit:1.1.3"
+    androidTestImplementation project(path: ":embrace-android-sdk")
 }
 
 dokkaHtml {

diff --git a/embrace-android-sdk/src/androidTest/AndroidManifest.xml b/embrace-android-sdk/src/androidTest/AndroidManifest.xml
@@ -3,4 +3,7 @@
 
     <uses-sdk tools:overrideLibrary="io.embrace.android.embracesdk.testserver"/>
 
+    <application>
+        <activity android:name="io.embrace.android.embracesdk.EmbraceContext$ActivityAccess" />
+    </application>
 </manifest>
diff --git a/test-server/README.md → ...ace-android-sdk/src/androidTest/README.md b/test-server/README.md → ...ace-android-sdk/src/androidTest/README.md
diff --git a/.../androidx/lifecycle/MockReportFragment.kt → .../androidx/lifecycle/MockReportFragment.kt b/.../androidx/lifecycle/MockReportFragment.kt → .../androidx/lifecycle/MockReportFragment.kt
diff --git a/.../lifecycle/ProcessLifecycleOwnerAccess.kt → .../lifecycle/ProcessLifecycleOwnerAccess.kt b/.../lifecycle/ProcessLifecycleOwnerAccess.kt → .../lifecycle/ProcessLifecycleOwnerAccess.kt
diff --git a/...roid/embracesdk/ActivityServiceHooks.java → ...roid/embracesdk/ActivityServiceHooks.java b/...roid/embracesdk/ActivityServiceHooks.java → ...roid/embracesdk/ActivityServiceHooks.java
diff --git a/...io/embrace/android/embracesdk/BaseTest.kt → ...io/embrace/android/embracesdk/BaseTest.kt b/...io/embrace/android/embracesdk/BaseTest.kt → ...io/embrace/android/embracesdk/BaseTest.kt
diff --git a/...ce/android/embracesdk/BuildInfoHooks.java → ...ce/android/embracesdk/BuildInfoHooks.java b/...ce/android/embracesdk/BuildInfoHooks.java → ...ce/android/embracesdk/BuildInfoHooks.java
diff --git a/...brace/android/embracesdk/ConfigHooks.java → ...brace/android/embracesdk/ConfigHooks.java b/...brace/android/embracesdk/ConfigHooks.java → ...brace/android/embracesdk/ConfigHooks.java
diff --git a/...race/android/embracesdk/EmbraceContext.kt → ...race/android/embracesdk/EmbraceContext.kt b/...race/android/embracesdk/EmbraceContext.kt → ...race/android/embracesdk/EmbraceContext.kt
diff --git a/...android/embracesdk/EmbraceFileObserver.kt → ...android/embracesdk/EmbraceFileObserver.kt b/...android/embracesdk/EmbraceFileObserver.kt → ...android/embracesdk/EmbraceFileObserver.kt
diff --git a/.../android/embracesdk/FakePackageManager.kt → .../android/embracesdk/FakePackageManager.kt b/.../android/embracesdk/FakePackageManager.kt → .../android/embracesdk/FakePackageManager.kt
diff --git a/.../embrace/android/embracesdk/TestServer.kt → .../embrace/android/embracesdk/TestServer.kt b/.../embrace/android/embracesdk/TestServer.kt → .../embrace/android/embracesdk/TestServer.kt
diff --git a/...droid/embracesdk/internal/MockActivity.kt → ...droid/embracesdk/internal/MockActivity.kt b/...droid/embracesdk/internal/MockActivity.kt → ...droid/embracesdk/internal/MockActivity.kt
diff --git a/...mbracesdk/internal/MockFragmentManager.kt → ...mbracesdk/internal/MockFragmentManager.kt b/...mbracesdk/internal/MockFragmentManager.kt → ...mbracesdk/internal/MockFragmentManager.kt
diff --git a/...e/android/embracesdk/internal/MockView.kt → ...e/android/embracesdk/internal/MockView.kt b/...e/android/embracesdk/internal/MockView.kt → ...e/android/embracesdk/internal/MockView.kt
diff --git a/...android/embracesdk/internal/MockWindow.kt → ...android/embracesdk/internal/MockWindow.kt b/...android/embracesdk/internal/MockWindow.kt → ...android/embracesdk/internal/MockWindow.kt
diff --git a/...bracesdk/internal/PauseProcessListener.kt → ...bracesdk/internal/PauseProcessListener.kt b/...bracesdk/internal/PauseProcessListener.kt → ...bracesdk/internal/PauseProcessListener.kt
diff --git a/...android/embracesdk/utils/BitmapFactory.kt → ...android/embracesdk/utils/BitmapFactory.kt b/...android/embracesdk/utils/BitmapFactory.kt → ...android/embracesdk/utils/BitmapFactory.kt
diff --git a/.../android/embracesdk/utils/FailureLatch.kt → .../android/embracesdk/utils/FailureLatch.kt b/.../android/embracesdk/utils/FailureLatch.kt → .../android/embracesdk/utils/FailureLatch.kt
diff --git a/...android/embracesdk/utils/JsonValidator.kt → ...android/embracesdk/utils/JsonValidator.kt b/...android/embracesdk/utils/JsonValidator.kt → ...android/embracesdk/utils/JsonValidator.kt
diff --git a/...brace/android/embracesdk/utils/Mutable.kt → ...brace/android/embracesdk/utils/Mutable.kt b/...brace/android/embracesdk/utils/Mutable.kt → ...brace/android/embracesdk/utils/Mutable.kt
diff --git a/settings.gradle b/settings.gradle
@@ -2,5 +2,4 @@ include ":embrace-android-sdk",
         ":embrace-android-okhttp3",
         ":embrace-android-fcm",
         ":embrace-android-compose",
-        ":embrace-lint",
-        ":test-server"
+        ":embrace-lint"
diff --git a/test-server/.gitignore b/test-server/.gitignore
diff --git a/test-server/build.gradle b/test-server/build.gradle
diff --git a/test-server/consumer-rules.pro b/test-server/consumer-rules.pro