Upgrade to AppFunctions 1.0.0-alpha10 #24
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,6 @@ package com.example.chatapp.appfunctions | |
| import android.content.Context | ||
| import android.net.Uri | ||
| import androidx.appfunctions.AppFunctionAppUnknownException | ||
| import androidx.appfunctions.AppFunctionElementNotFoundException | ||
| import androidx.appfunctions.AppFunctionInvalidArgumentException | ||
| import androidx.test.core.app.ApplicationProvider | ||
|
|
@@ -38,12 +37,6 @@ import org.junit.runner.RunWith | |
|
|
||
| @RunWith(AndroidJUnit4::class) | ||
| class AppFunctionsTest { | ||
| private class MockMessageRepository : MessageRepository { | ||
| var shouldFail = false | ||
| private val messages = MutableStateFlow<Map<String, List<DisplayMessage>>>(emptyMap()) | ||
|
|
@@ -85,19 +78,47 @@ class AppFunctionsTest { | |
|
|
||
| private val callManager = CallManager(recipientsRepository) | ||
|
|
||
| private class TestChatAppFunctionService( | ||
| val testContext: Context, | ||
| messageRepo: MessageRepository, | ||
| recipientsRepo: RecipientsRepository, | ||
| callMgr: CallManager, | ||
| ) : BaseChatAppFunctionService() { | ||
| init { | ||
|
There was a problem hiding this comment. I'll suggest use AppFunctionManager API to test so that the service doesn't need to be faked. That will be our testing suggestion for app developer as well. In general, the testing is done as following
This will ensure that the testing is e2e and represent how agent will use it. The mocking test has a problem that if developer setup the manifest or something incorrectly, it would not catch it. There was a problem hiding this comment. Actually, these are covered in https://github.com/android/appfunctions/blob/main/ChatApp/app/src/androidTest/kotlin/com/example/chatapp/appfunctions/AppFunctionInstrumentationTest.kt. So I think we can delete this file safely |
||
| attachBaseContext(testContext) | ||
| this.messageRepository = messageRepo | ||
| this.recipientsRepository = recipientsRepo | ||
| this.callManager = callMgr | ||
| } | ||
|
|
||
| override fun onExecuteFunction( | ||
| request: androidx.appfunctions.ExecuteAppFunctionRequest, | ||
| cancellationSignal: android.os.CancellationSignal, | ||
| callback: java.util.function.Consumer<androidx.appfunctions.ExecuteAppFunctionResponse>, | ||
| ) { | ||
| // Not used in direct unit tests | ||
| } | ||
| } | ||
|
|
||
| private val appFunctions = | ||
| TestChatAppFunctionService( | ||
| ApplicationProvider.getApplicationContext(), | ||
| messageRepository, | ||
| recipientsRepository, | ||
| callManager, | ||
| ) | ||
|
|
||
| @Test(expected = AppFunctionInvalidArgumentException::class) | ||
| fun searchContacts_returnsEmptyList() { | ||
| runBlocking { | ||
| appFunctions.searchContacts("nonexistent", "INDIVIDUAL") | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun searchContacts_returnsMatches() { | ||
| runBlocking { | ||
| val contacts = appFunctions.searchContacts("Alice", "INDIVIDUAL") | ||
| Assert.assertEquals(1, contacts.size) | ||
| Assert.assertEquals("Alice Smith", contacts[0].displayName) | ||
| } | ||
|
|
@@ -106,7 +127,7 @@ class AppFunctionsTest { | |
| @Test | ||
| fun searchContacts_groups_returnsMatches() { | ||
| runBlocking { | ||
| val contacts = appFunctions.searchContacts("Work", "GROUP") | ||
| Assert.assertEquals(1, contacts.size) | ||
| Assert.assertEquals("Work Friends", contacts[0].displayName) | ||
| } | ||
|
|
@@ -115,16 +136,15 @@ class AppFunctionsTest { | |
| @Test | ||
| fun searchContacts_emptyQuery_returnsRecent() { | ||
| runBlocking { | ||
| val contacts = appFunctions.searchContacts("", "INDIVIDUAL") | ||
| Assert.assertEquals(3, contacts.size) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun searchContacts_anyType_returnsMatches() { | ||
| runBlocking { | ||
| val contacts = appFunctions.searchContacts("Alice", "ANY") | ||
| Assert.assertEquals(1, contacts.size) | ||
| Assert.assertEquals("Alice Smith", contacts[0].displayName) | ||
| } | ||
|
|
@@ -133,9 +153,9 @@ class AppFunctionsTest { | |
| @Test | ||
| fun send_validMessage_returnsSuccess() { | ||
| runTest { | ||
| val result = appFunctions.send("1", "Hello") | ||
| Assert.assertEquals( | ||
| Result( | ||
| "Message ID", | ||
| "Message sent to: Alice Smith.", | ||
| ), | ||
|
|
@@ -149,13 +169,12 @@ class AppFunctionsTest { | |
| runTest { | ||
| val result = | ||
| appFunctions.send( | ||
| "1", | ||
| "Hello", | ||
| listOf(Uri.parse("content://media/1")), | ||
| ) | ||
| Assert.assertEquals( | ||
| Result( | ||
| "Message ID", | ||
| "Message sent to: Alice Smith.", | ||
| ), | ||
|
|
@@ -167,9 +186,9 @@ class AppFunctionsTest { | |
| @Test | ||
| fun send_toGroup_success() { | ||
| runTest { | ||
| val result = appFunctions.send("g1", "Hello") | ||
| Assert.assertEquals( | ||
| Result( | ||
| "Message ID", | ||
| "Message sent to: Work Friends.", | ||
| ), | ||
|
|
@@ -181,39 +200,37 @@ class AppFunctionsTest { | |
| @Test(expected = AppFunctionInvalidArgumentException::class) | ||
| fun send_emptyContent_fails() { | ||
| runTest { | ||
| appFunctions.send("1", "") | ||
| } | ||
| } | ||
|
|
||
| @Test(expected = AppFunctionElementNotFoundException::class) | ||
| fun send_invalidRecipient_fails() { | ||
| runTest { | ||
| appFunctions.send("nonexistent_id", "Hello") | ||
| } | ||
| } | ||
|
|
||
| @Test(expected = AppFunctionAppUnknownException::class) | ||
| fun send_repositoryError_returnsError() { | ||
| runTest { | ||
| messageRepository.shouldFail = true | ||
| appFunctions.send("1", "Hello") | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun makeCall_returnsPendingIntent() { | ||
| runBlocking { | ||
| val pendingIntent = appFunctions.makeCall(endpointValue = "1") | ||
| Assert.assertNotNull(pendingIntent) | ||
| } | ||
| } | ||
|
|
||
| @Test(expected = AppFunctionElementNotFoundException::class) | ||
| fun makeCall_invalidEndpointValue_fails() { | ||
| runBlocking { | ||
| appFunctions.makeCall(endpointValue = "nonexistent_id") | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: seems this is fixed?