Add optional pageType parameter to ParselyMetadata class in Android SDK

.github/workflows/readme.yml

@@ -22,6 +22,14 @@ jobs:
         run: ./gradlew :example:assembleDebug
       - name: Android Lint
         run: ./gradlew lintDebug
+      - name: Android Unit Tests
+        run: ./gradlew :parsely:testDebugUnitTest
+      - name: Generate XML coverage report
+        run: ./gradlew :parsely:koverXmlReportDebug
+      - uses: codecov/codecov-action@v3
+        with:
+          files: parsely/build/reports/kover/reportDebug.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
       - name: Validate Maven publication
         run: ./gradlew :parsely:publishReleasePublicationToMavenLocal
         env:
@@ -35,3 +43,35 @@ jobs:
         with:
           name: artifact
           path: ~/.m2/repository/com/parsely/parsely/*
+  functional-tests:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: set up JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+      - name: Functional Tests
+        uses: reactivecircus/[email protected]
+        with:
+          working-directory: .
+          api-level: 31
+          profile: Nexus 6
+          arch: x86_64
+          force-avd-creation: false
+          avd-name: macOS-avd-x86_64-31
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: ./gradlew :parsely:connectedDebugAndroidTest
+      - name: Publish build artifacts
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: artifact
+          path: |
+            ./parsely/build/reports/*
+            ./parsely/build/outputs/androidTest-results

codecov.yml

@@ -0,0 +1,7 @@
+github_checks:
+    annotations: false
+
+coverage:
+  status:
+    project: off
+    patch: off

example/src/main/java/com/example/MainActivity.java

@@ -30,33 +30,18 @@ protected void onCreate(Bundle savedInstanceState) {
         // Set debugging to true so we don't actually send things to Parse.ly
         ParselyTracker.sharedInstance().setDebug(true);
 
-        final TextView queueView = (TextView) findViewById(R.id.queue_size);
-        queueView.setText(String.format("Queued events: %d", ParselyTracker.sharedInstance().queueSize()));
-
-        final TextView storedView = (TextView) findViewById(R.id.stored_size);
-        storedView.setText(String.format("Stored events: %d", ParselyTracker.sharedInstance().storedEventsCount()));
-
         final TextView intervalView = (TextView) findViewById(R.id.interval);
-        storedView.setText(String.format("Flush interval: %d", ParselyTracker.sharedInstance().getFlushInterval()));
 
         updateEngagementStrings();
 
-        final TextView views[] = new TextView[3];
-        views[0] = queueView;
-        views[1] = storedView;
-        views[2] = intervalView;
+        final TextView views[] = new TextView[1];
+        views[0] = intervalView;
 
         final Handler mHandler = new Handler() {
             @Override
             public void handleMessage(Message msg) {
                 TextView[] v = (TextView[]) msg.obj;
-                TextView qView = v[0];
-                qView.setText(String.format("Queued events: %d", ParselyTracker.sharedInstance().queueSize()));
-
-                TextView sView = v[1];
-                sView.setText(String.format("Stored events: %d", ParselyTracker.sharedInstance().storedEventsCount()));
-
-                TextView iView = v[2];
+                TextView iView = v[0];
                 if (ParselyTracker.sharedInstance().flushTimerIsActive()) {
                     iView.setText(String.format("Flush Interval: %d", ParselyTracker.sharedInstance().getFlushInterval()));
                 } else {

example/src/main/res/layout/activity_main.xml

@@ -68,26 +68,11 @@
         android:onClick="trackReset"
         android:text="@string/button_reset_video" />
 
-    <TextView
-        android:id="@+id/queue_size"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/reset_video_button"
-        android:layout_centerHorizontal="true"
-        android:text="Queued events: 0" />
-
-    <TextView android:id="@+id/stored_size"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_below="@id/queue_size" 
-        android:text="Stored events: 0"/>
-
     <TextView android:id="@+id/interval"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_below="@id/stored_size" 
+        android:layout_below="@id/reset_video_button"
         android:text="Flush timer inactive"/>
 
     <TextView
@@ -107,4 +92,4 @@
         android:text="Video is inactive." />
 
 
-</RelativeLayout>
+</RelativeLayout>

parsely/build.gradle

@@ -1,5 +1,13 @@
 plugins {
     id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlinx.kover'
+}
+
+ext {
+    assertJVersion = '3.24.2'
+    coroutinesVersion = '1.7.3'
+    mockWebServerVersion = '4.12.0'
 }
 
 android {
@@ -8,6 +16,12 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 33
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments clearPackageData: 'true'
+    }
+    testOptions {
+        execution 'ANDROIDX_TEST_ORCHESTRATOR'
     }
     buildTypes {
         release {
@@ -27,27 +41,45 @@ android {
             withJavadocJar()
         }
     }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
+
+    koverReport {
+        filters {
+            excludes {
+                classes(
+                        "*.BuildConfig"
+                )
+            }
+        }
+    }
 }
 
 dependencies {
-    def kotlinVersion = "1.8.10"
-
     implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.3'
     implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
     implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
-    constraints {
-        add("implementation", "org.jetbrains.kotlin:kotlin-stdlib-jdk7") {
-            version {
-                require(kotlinVersion)
-            }
-        }
-        add("implementation", "org.jetbrains.kotlin:kotlin-stdlib-jdk8") {
-            version {
-                require(kotlinVersion)
-            }
-        }
-    }
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+
+    testImplementation 'org.robolectric:robolectric:4.10.3'
+    testImplementation 'androidx.test:core:1.5.0'
+    testImplementation "org.assertj:assertj-core:$assertJVersion"
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation "com.squareup.okhttp3:mockwebserver:$mockWebServerVersion"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion"
+
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test:rules:1.5.0'
+    androidTestImplementation "org.assertj:assertj-core:$assertJVersion"
+    androidTestImplementation "com.squareup.okhttp3:mockwebserver:$mockWebServerVersion"
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
+    androidTestUtil 'androidx.test:orchestrator:1.4.2'
 }
 
 apply from: "${rootProject.projectDir}/publication.gradle"