ci: functional tests

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
   # after build and unit tests are finished, publish all modules at once
   # to help reduce the probability of failure when interacting with sonatype servers
   release:
-    name: Publish To Maven
+    name: Release
     needs: [lint, test, build]
     runs-on: ubuntu-latest
     steps:

.github/workflows/test.yml

@@ -6,8 +6,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  test:
-    name: Test
+  test_unit:
+    name: Unit Tests
     runs-on: ubuntu-latest
 
     steps:
@@ -21,6 +21,69 @@ jobs:
           distribution: 'microsoft'
           cache: gradle
 
-      - name: Run Tests
+      - name: Run Unit Tests
         run: ./gradlew testReleaseUnitTest
         continue-on-error: false
+
+  test_unit_coverage:
+    name: Unit Tests Coverage
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Run Unit Tests Coverage
+        run: ./gradlew koverXmlReportDebug
+
+      - name: Show Coverage Report XML
+        run: cat library/build/reports/kover/reportDebug.xml
+
+      - name: Add coverage report to PR
+        id: kover
+        uses: mi-kas/kover-report@v1.8
+        with:
+          path: ${{ github.workspace }}/library/build/reports/kover/reportDebug.xml
+          title: Code Coverage
+          update-comment: true
+          min-coverage-overall: 85
+          min-coverage-changed-files: 85
+          coverage-counter-type: LINE
+
+  test_instrumentation:
+    name: Instrumentation Tests
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Run Instrumentation Tests
+        uses: ReactiveCircus/android-emulator-runner@v2
+        with:
+          api-level: 23
+          target: google_apis
+          arch: x86_64
+          script: ./gradlew connectedCheck --info
+        continue-on-error: true
+
+      - name: Show Test XML
+        run: |
+          cat library/build/outputs/androidTest-results/connected/*.xml
+          echo ""
+          error_count=$(grep "<failure>" library/build/outputs/androidTest-results/connected/*.xml | wc -l | awk '{$1=$1};1')
+          if [[ "$error_count" -ne "0" ]]; then echo "Tests failed. See above"; exit 1; fi

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jul 12 10:12:47 EDT 2023
+#Tue Dec 19 11:47:10 EST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

library/build.gradle

@@ -17,6 +17,7 @@ android {
 		versionCode modules.sdkVersionCode
 		versionName modules.sdkVersionName 
 		testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+	  testInstrumentationRunnerArguments clearPackageData: 'true'
 		consumerProguardFiles 'consumer-rules.pro'
 
 		buildConfigField('String', 'INTEGRATION_TYPE', "\"NATIVE_ANDROID\"")
@@ -31,13 +32,17 @@ android {
 		viewBinding = true
 	}
 
-	buildTypes {
-		release {
-			version = android.defaultConfig.versionName // had to add this to get the version in the build
-			minifyEnabled false
-			proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-		}
-	}
+  buildTypes {
+    release {
+			version = android.defaultConfig.versionName
+      minifyEnabled false
+      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+	    resValue("string", "clear_text_config","false")
+    }
+	  debug {
+		  resValue("string", "clear_text_config","true")
+	  }
+  }
 
 	compileOptions {
 		sourceCompatibility JavaVersion.VERSION_1_8
@@ -49,6 +54,7 @@ android {
 	}
 
 	testOptions {
+		execution 'ANDROIDX_TEST_ORCHESTRATOR'
 		unitTests.all {
 			useJUnitPlatform()
 			testLogging {
@@ -65,20 +71,17 @@ tasks.withType(Test) {
 koverReport {
 	androidReports('debug') {
 		filters {
-//			includes {
-//				classes(
-//					'PayPalErrors\$*'
-//				)
-//			}
 			excludes {
 				classes(
 					// config
 					'com.paypal.messages.config.message.PayPalMessageEventsCallbacks\$*',
 					'com.paypal.messages.config.message.PayPalMessageViewStateCallbacks\$*',
 					'com.paypal.messages.config.modal.ModalEvents\$*',
 					// extensions,
-					'com.paypal.messages.extensions.*',
+					'com.paypal.messages.extensions.Int*',
 					// io
+					'com.paypal.messages.io.Api',
+					'com.paypal.messages.io.Api\$*',
 					'com.paypal.messages.io.Api\$Endpoints',
 					'com.paypal.messages.io.ApiMessageData',
 					'com.paypal.messages.io.ApiHashData',
@@ -96,6 +99,7 @@ koverReport {
 					'*Activity\$*',
 					'com.paypal.messages.PayPalMessageView*',
 					'com.paypal.messages.RoundedWebView',
+					'com.paypal.messages.RoundedWebView\$*',
 					'*.databinding.*',
 					'*.BuildConfig'
 				)
@@ -107,7 +111,7 @@ koverReport {
 dependencies {
 	implementation 'androidx.core:core-ktx:1.12.0'
 	implementation 'androidx.appcompat:appcompat:1.6.1'
-	implementation 'com.google.android.material:material:1.10.0'
+	implementation 'com.google.android.material:material:1.11.0'
 	implementation 'com.google.code.gson:gson:2.9.1'
 	implementation 'com.squareup.okhttp3:okhttp:4.8.0'
 
@@ -117,8 +121,11 @@ dependencies {
 	testImplementation 'org.mockito.kotlin:mockito-kotlin:5.1.0'
 	testImplementation 'io.mockk:mockk:1.13.7'
 
+	androidTestUtil 'androidx.test:orchestrator:1.4.2'
+	androidTestImplementation 'androidx.test:rules:1.5.0'
 	androidTestImplementation 'androidx.test.ext:junit:1.1.5'
 	androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+	androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1'
 	androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.8.0'
 }
 

library/src/androidTest/java/com/paypal/messages/PayPalMessageViewTest.kt

@@ -0,0 +1,70 @@
+package com.paypal.messages
+
+import android.widget.TextView
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import com.paypal.messages.config.PayPalMessageOfferType
+import com.paypal.messages.config.ProductGroup
+import com.paypal.messages.config.modal.ModalCloseButton
+import com.paypal.messages.io.ApiMessageData
+import com.paypal.messages.io.ApiResult
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.UUID
+import com.paypal.messages.config.message.PayPalMessageConfig as MessageConfig
+import com.paypal.messages.config.message.PayPalMessageData as MessageData
+
+@RunWith(AndroidJUnit4::class)
+class PayPalMessageViewTest {
+// 	@get:Rule
+// 	val activityTestRule = ActivityTestRule(TestActivity::class.java)
+//
+// 	@get:Rule
+// 	val activityScenarioRule = ActivityScenarioRule(TestActivity::class.java)
+
+	private val defaultMain = "Test main"
+	private val defaultDisclaimer = "Test disclaimer"
+	private val response = ApiMessageData.Response(
+		meta = ApiMessageData.Metadata(
+			creditProductGroup = ProductGroup.PAYPAL_CREDIT,
+			offerCountryCode = "",
+			offerType = PayPalMessageOfferType.PAY_LATER_PAY_IN_1,
+			messageType = "",
+			modalCloseButton = ModalCloseButton(
+				0,
+				0,
+				0,
+				0,
+				"",
+				"",
+			),
+			variables = ApiMessageData.Variables(logoPlaceholder = ""),
+			merchantCountryCode = "",
+			creditProductIdentifiers = List(0) { "" },
+			debugId = "",
+			fdata = "",
+			trackingKeys = List(0) { "" },
+			originatingInstanceId = UUID.randomUUID(),
+		),
+		content = ApiMessageData.ContentOptions(
+			default = ApiMessageData.ContentDetails(main = defaultMain, disclaimer = defaultDisclaimer),
+			generic = ApiMessageData.ContentDetails(main = "", disclaimer = ""),
+		),
+	)
+
+	@Test
+	fun testUpdateMessageContent() {
+		val context = InstrumentationRegistry.getInstrumentation().targetContext
+		val payPalMessageView = PayPalMessageView(
+			context = context,
+			config = MessageConfig(MessageData(clientID = "test_client_id")),
+		)
+
+		payPalMessageView.onActionCompleted(ApiResult.Success(response))
+
+		val messageTextView = payPalMessageView.findViewById<TextView>(R.id.content)
+		assertTrue(messageTextView.text.toString().contains(defaultMain))
+		assertTrue(messageTextView.text.toString().contains(defaultDisclaimer))
+	}
+}

library/src/androidTest/java/com/paypal/messages/TestActivity.kt

@@ -0,0 +1,15 @@
+package com.paypal.messages
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+
+class TestActivity : AppCompatActivity() {
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(layout)
+	}
+
+	companion object {
+		var layout: Int = 0
+	}
+}