bump aap-lv2 and add androidTest.

The instrumentation tests still fail due to known issue #1.
atsushieno · May 24, 2021 · 326d4e4 · 326d4e4
1 parent d60b2f0
commit 326d4e4
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 47 deletions.
diff --git a/aap-guitarix/build.gradle b/aap-guitarix/build.gradle
@@ -13,7 +13,6 @@ android {
         versionName "0.1.12"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
 
         externalNativeBuild {
             cmake {
@@ -59,11 +58,15 @@ android {
 }
 
 dependencies {
-    implementation 'org.androidaudioplugin:androidaudioplugin-lv2:0.1.12'
-    implementation 'org.androidaudioplugin:androidaudioplugin-ui-compose:0.6.10'
+    implementation 'org.androidaudioplugin:androidaudioplugin-lv2:0.1.14'
+    implementation 'org.androidaudioplugin:androidaudioplugin-ui-compose:0.6.13'
 
     testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'org.androidaudioplugin:androidaudioplugin:0.6.13'
+    androidTestImplementation 'org.androidaudioplugin:androidaudioplugin-testing:0.6.13'
+    androidTestImplementation 'androidx.test:core:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
 
diff --git a/aap-guitarix/src/androidTest/java/org/androidaudioplugin/aap_guitarix/PluginTest.kt b/aap-guitarix/src/androidTest/java/org/androidaudioplugin/aap_guitarix/PluginTest.kt
@@ -0,0 +1,33 @@
+package org.androidaudioplugin.aap_mda_lv2
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.ServiceTestRule
+import org.androidaudioplugin.AudioPluginHostHelper
+import org.androidaudioplugin.androidaudioplugin.testing.AudioPluginServiceTesting
+import org.junit.Rule
+import org.junit.Test
+
+class PluginTest {
+    private val applicationContext = ApplicationProvider.getApplicationContext<Context>()
+    private val testing = AudioPluginServiceTesting(applicationContext)
+    @get:Rule
+    val serviceRule = ServiceTestRule()
+
+    @Test
+    fun getPluginServiceInfo() {
+        testing.getPluginServiceInfo()
+    }
+
+    @Test
+    fun basicServiceOperationsForAllPlugins() {
+        testing.basicServiceOperationsForAllPlugins()
+    }
+
+    @Test
+    fun repeatDirectServieOperations() {
+        for (i in 0 until 5)
+            basicServiceOperationsForAllPlugins()
+    }
+}
diff --git a/...ix/src/androidTest/java/org/androidaudioplugin/aappluginsample/ExampleInstrumentedTest.kt b/...ix/src/androidTest/java/org/androidaudioplugin/aappluginsample/ExampleInstrumentedTest.kt
diff --git a/aap-guitarix/src/test/java/org/androidaudioplugin/aappluginsample/ExampleUnitTest.kt b/aap-guitarix/src/test/java/org/androidaudioplugin/aappluginsample/ExampleUnitTest.kt
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0-alpha15'
+        classpath 'com.android.tools.build:gradle:7.1.0-alpha01'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.4.30"
     }

diff --git a/external/aap-lv2 b/external/aap-lv2
+0 −4		.github/workflows/actions.yml
+24 −5		aap-ayumi/build.gradle
+33 −0		aap-ayumi/src/androidTest/java/org/androidaudioplugin/aap_ayumi/PluginTest.kt
+0 −24		aap-ayumi/src/androidTest/java/org/androidaudioplugin/samples/aap_sfizz/ExampleInstrumentedTest.kt
+10 −0		aap-ayumi/src/main/AndroidManifest.xml
+1 −1		aap-ayumi/src/main/res/xml/aap_metadata.xml
+6 −0		aap-ayumi/src/main/res/xml/midi_device_info.xml
+0 −17		aap-ayumi/src/test/java/org/androidaudioplugin/samples/aap_sfizz/ExampleUnitTest.kt
+12 −20		androidaudioplugin-lv2/build.gradle
+0 −24		androidaudioplugin-lv2/src/androidTest/java/org/androidaudioplugin/lv2/ExampleInstrumentedTest.kt
+5 −0		androidaudioplugin-lv2/src/main/cpp/CMakeLists.txt
+2 −2		androidaudioplugin-lv2/src/main/cpp/src/android-audio-plugin-lv2-bridge.cpp
+4 −4		build.gradle
+1 −1		dependencies/android-audio-plugin-framework
+1 −1		dependencies/ayumi-lv2
+37 −0		setup-asan-for-debugging.sh