android test app

.github/workflows/android-appcenter.yml

@@ -5,22 +5,20 @@ on:
  push:
  branches: [ main ]
  paths:
- - 'demo/android/OctopusDemo/**'
- - '!demo/android/OctopusDemo/README.md'
+ - 'binding/android/OctopusTestApp/**'
  - 'res/audio/**'
  - '.github/workflows/android-appcenter.yml'
 
  pull_request:
  branches: [ main, 'v[0-9]+.[0-9]+' ]
  paths:
- - 'demo/android/OctopusDemo/**'
- - '!demo/android/OctopusDemo/README.md'
+ - 'binding/android/OctopusTestApp/**'
  - 'res/audio/**'
  - '.github/workflows/android-appcenter.yml'
 
 defaults:
  run:
- working-directory: demo/android/OctopusDemo
+ working-directory: binding/android/OctopusTestApp
 
 jobs:
  build:
@@ -50,6 +48,16 @@ jobs:
  - name: Inject AccessKey
  run: echo pvTestingAccessKey="${{secrets.PV_VALID_ACCESS_KEY}}" >> local.properties
 
+ - name: Inject Android keystore variables
+ run: |
+ echo storePassword="${{secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD}}" >> local.properties
+ echo keyPassword="${{secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD}}" >> local.properties
+ echo keyAlias=picovoice >> local.properties
+ echo storeFile=../picovoice.jks >> local.properties
+
+ - name: Setup Android keystore file
+ run: echo "${{secrets.ANDROID_RELEASE_KEYSTORE_FILE_B64}}" | base64 -d > picovoice.jks
+
  - name: Build app
  run: ./gradlew assembleDebug
 
@@ -61,7 +69,64 @@ jobs:
  --token ${{secrets.APPCENTERAPITOKEN}}
  --app "Picovoice/Octopus-Android"
  --devices "Picovoice/android-min-max"
- --app-path octopus-demo-app/build/outputs/apk/debug/octopus-demo-app-debug.apk
+ --app-path octopus-test-app/build/outputs/apk/debug/octopus-test-app-debug.apk
  --test-series "octopus-android"
  --locale "en_US"
- --build-dir octopus-demo-app/build/outputs/apk/androidTest/debug
+ --build-dir octopus-test-app/build/outputs/apk/androidTest/debug
+
+ build-integ:
+ name: Run Android Integration Tests on AppCenter
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Set up Node.js LTS
+ uses: actions/setup-node@v3
+ with:
+ node-version: lts/*
+
+ - name: Install AppCenter CLI
+ run: npm install -g appcenter-cli
+
+ - name: set up JDK 11
+ uses: actions/setup-java@v3
+ with:
+ java-version: '11'
+ distribution: 'temurin'
+
+ - name: Copy test_resources
+ run: ./copy_test_resources.sh
+
+ - name: Inject AccessKey
+ run: echo pvTestingAccessKey="${{secrets.PV_VALID_ACCESS_KEY}}" >> local.properties
+
+ - name: Inject Android keystore variables
+ run: |
+ echo storePassword="${{secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD}}" >> local.properties
+ echo keyPassword="${{secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD}}" >> local.properties
+ echo keyAlias=picovoice >> local.properties
+ echo storeFile=../picovoice.jks >> local.properties
+
+ - name: Setup Android keystore file
+ run: echo "${{secrets.ANDROID_RELEASE_KEYSTORE_FILE_B64}}" | base64 -d > picovoice.jks
+
+ - name: Grant execute permission for gradlew
+ run: chmod +x gradlew
+
+ - name: Build app
+ run: ./gradlew assembleRelease
+
+ - name: Build androidTest
+ run: ./gradlew assembleReleaseAndroidTest -DtestBuildType=integ
+
+ - name: Run tests on AppCenter
+ run: appcenter test run espresso
+ --token ${{secrets.APPCENTERAPITOKEN}}
+ --app "Picovoice/Octopus-Android"
+ --devices "Picovoice/android-min-max"
+ --app-path octopus-test-app/build/outputs/apk/release/octopus-test-app-release.apk
+ --test-series "octopus-android"
+ --locale "en_US"
+ --build-dir octopus-test-app/build/outputs/apk/androidTest/release
+

.github/workflows/android-perf.yml

@@ -18,7 +18,7 @@ on:
 
 defaults:
  run:
- working-directory: demo/android/OctopusDemo
+ working-directory: binding/android/OctopusTestApp
 
 jobs:
  build:
@@ -62,6 +62,16 @@ jobs:
  - name: Inject Number of Iterations
  run: echo numTestIterations="30" >> local.properties
 
+ - name: Inject Android keystore variables
+ run: |
+ echo storePassword="${{secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD}}" >> local.properties
+ echo keyPassword="${{secrets.ANDROID_RELEASE_KEYSTORE_PASSWORD}}" >> local.properties
+ echo keyAlias=picovoice >> local.properties
+ echo storeFile=../picovoice.jks >> local.properties
+
+ - name: Setup Android keystore file
+ run: echo "${{secrets.ANDROID_RELEASE_KEYSTORE_FILE_B64}}" | base64 -d > picovoice.jks
+
  - name: Inject Index Performance Threshold
  run: echo indexPerformanceThresholdSec="${{ matrix.indexPerformanceThresholdSec }}" >> local.properties
 
@@ -75,15 +85,15 @@ jobs:
  run: ./gradlew assembleDebug
 
  - name: Build androidTest
- run: ./gradlew assembleAndroidTest
+ run: ./gradlew assembleAndroidTest -DtestBuildType=perf
 
  - name: Run tests on AppCenter
  run: appcenter test run espresso
  --token ${{secrets.APPCENTERAPITOKEN}}
  --app "Picovoice/Octopus-Android"
  --devices "Picovoice/${{ matrix.device }}"
- --app-path octopus-demo-app/build/outputs/apk/debug/octopus-demo-app-debug.apk
+ --app-path octopus-test-app/build/outputs/apk/debug/octopus-test-app-debug.apk
  --test-series "octopus-android"
  --locale "en_US"
- --build-dir octopus-demo-app/build/outputs/apk/androidTest/debug
+ --build-dir octopus-test-app/build/outputs/apk/androidTest/debug
 

binding/android/OctopusTestApp/.gitignore

@@ -0,0 +1,12 @@
+*.iml
+.gradle
+/local.properties
+/.idea/
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+release
+test_resources
+*.pv
+*.wav

binding/android/OctopusTestApp/build.gradle

@@ -0,0 +1,24 @@
+ext {
+ defaultTargetSdkVersion = 31
+}
+
+buildscript {
+ repositories {
+ google()
+ mavenCentral()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:7.2.2'
+ }
+}
+
+allprojects {
+ repositories {
+ google()
+ mavenCentral()
+ }
+}
+
+task clean(type: Delete) {
+ delete rootProject.buildDir
+}

binding/android/OctopusTestApp/copy_test_resources.sh

@@ -0,0 +1,17 @@
+if [ ! -d "./octopus-test-app/src/androidTest/assets/test_resources/audio" ]
+then
+ echo "Creating test audio samples directory..."
+ mkdir -p ./octopus-test-app/src/androidTest/assets/test_resources/audio
+fi
+
+echo "Copying test audio samples..."
+cp ../../../res/audio/multiple_keywords*.wav ./octopus-test-app/src/androidTest/assets/test_resources/audio/
+
+if [ ! -d "./octopus-test-app/src/androidTest/assets/test_resources/param" ]
+then
+ echo "Creating octopus params directory..."
+ mkdir -p ./octopus-test-app/src/androidTest/assets/test_resources/param
+fi
+
+echo "Copying octopus params files..."
+cp ../../../lib/common/param/octopus_params*.pv ./octopus-test-app/src/androidTest/assets/test_resources/param/

binding/android/OctopusTestApp/gradle.properties

@@ -0,0 +1,17 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true

binding/android/OctopusTestApp/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Wed Jul 19 13:57:31 PDT 2023
+distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME