finish MockPuppet and add test method for say with mention list

Author: redmaple1

wechaty-puppet-mock/src/main/kotlin/io/github/wechaty/MockPuppet.kt

@@ -250,7 +250,7 @@ class MockPuppet(puppetOptions: PuppetOptions) : Puppet(puppetOptions) {
     override fun messageSendText(conversationId: String, text: String, mentionList: List<String>?): Future<String?> {
         log.info("MockPuppet messageSendText($conversationId,$text,${JsonUtils.write(mentionList ?: "")})")
 
-        return CompletableFuture.completedFuture(null)
+        return CompletableFuture.completedFuture("mock-msg-$conversationId")
     }
 
     override fun messageSendUrl(conversationId: String, urlLinkPayload: UrlLinkPayload): Future<String?> {

wechaty/src/main/kotlin/io/github/wechaty/user/Room.kt

@@ -75,10 +75,7 @@ class Room(wechaty: Wechaty, val id: String) : Accessory(wechaty), Sayable {
                 is String -> {
                     var mentionList = listOf<Any>()
                     if (varList.isNotEmpty()) {
-                        val list = varList[0]
-                        if (list !is List<*>){
-                            throw Exception("room say contact args not valid")
-                        }
+                        val list = varList[0] as? List<*> ?: throw Exception("room say contact args not valid")
                         list.forEach {
                             if (it !is Contact) {
                                 throw Exception("mentionList must be contact when not using String array function call.")

wechaty/src/test/kotlin/io/github/wechaty/user/RoomTest.kt

@@ -5,19 +5,12 @@ import io.github.wechaty.Puppet
 import io.github.wechaty.Wechaty
 import io.github.wechaty.WechatyOptions
 import io.github.wechaty.schemas.PuppetOptions
-import io.github.wechaty.user.manager.MessageManager
-import io.github.wechaty.utils.MockitoHelper
 import org.junit.After
+import org.junit.Assert
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Test
-import org.mockito.ArgumentMatchers
-import org.mockito.Mock
-import org.mockito.Mockito
-import org.mockito.Mockito.*
-import org.mockito.Spy
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.Future
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.spy
 
 /**
  * @author renxiaoya
@@ -29,6 +22,7 @@ const val EXPECTED_CONTACT_1_ID = "contact1"
 const val EXPECTED_CONTACT_1_ALIAS = "little1"
 const val EXPECTED_CONTACT_2_ID = "contact2"
 const val EXPECTED_CONTACT_2_ALIAS = "big2"
+
 class RoomTest {
 
     lateinit var wechaty: Wechaty
@@ -45,7 +39,6 @@ class RoomTest {
         wechatyOptions.puppet = "wechaty-puppet-mock"
         wechatyOptions.puppetOptions = PuppetOptions()
         wechaty = Wechaty.instance(wechatyOptions)
-//        wechaty = spy(wechaty)
         wechaty.start()
 
         room = wechaty.roomManager.load(EXPECTED_ROOM_ID)
@@ -58,31 +51,19 @@ class RoomTest {
     }
 
     @Test
-    // ignore temporary because it doesn't work for now
-    @Ignore
-    fun say() {
+    fun sayStringWithMentionList() {
         val contact1 = wechaty.contactManager.load(EXPECTED_CONTACT_1_ID)
         val contact2 = wechaty.contactManager.load(EXPECTED_CONTACT_2_ID)
         contact1.sync()
         contact2.sync()
 
-        val spyWechaty: Wechaty = spy(wechaty)
-        val spyRoom:Room = spy(room)
-        val spyPuppet:Puppet = spy(puppet)
+        val spyRoom: Room = spy(room)
         `when`(spyRoom.alias(contact1)).thenReturn("test-contact1-alias")
         `when`(spyRoom.alias(contact2)).thenReturn("test-contact2-alias")
 
-        val msgId = "test_msgId"
-        `when`(spyWechaty.getPuppet()).thenReturn(spyPuppet)
-        `when`(spyPuppet.messageSendText("test-conversation-id"
-            , "contact1 contact2"
-            , listOf("test-mentioned"))).thenReturn(CompletableFuture.completedFuture(msgId))
-        val msg = mock(Message::class.java)
-        val spyMessageManager:MessageManager = spy(wechaty.messageManager)
-        `when`(spyMessageManager.load(msgId)).thenReturn(msg)
-
         val text = "test-text"
-        spyRoom.say(text, listOf(contact1, contact2))
+        val resMsg = spyRoom.say(text, listOf(contact1, contact2)).get()
 
+        Assert.assertEquals((resMsg as Message).id, "mock-msg-$EXPECTED_ROOM_ID")
     }
 }