#25 fix test error after using async method

Author: jcai

wechaty/src/main/scala/wechaty/plugins/DingDong.scala

@@ -1,5 +1,6 @@
 package wechaty.plugins
 
+import com.typesafe.scalalogging.LazyLogging
 import wechaty.user.Message
 import wechaty.{Wechaty, WechatyPlugin}
 
@@ -37,7 +38,7 @@ case class DingDongConfig(
     */
   var dingReg:String="^#ding$",
 )
-class DingDongPlugin(config:DingDongConfig,/*only for test*/isWait:Boolean=false) extends WechatyPlugin{
+class DingDongPlugin(config:DingDongConfig,/*only for test*/isWait:Boolean=false) extends WechatyPlugin with LazyLogging{
   private val DONG="dong"
   private val DING_REGEXP=("("+config.dingReg+")").r
   private def isMatch(message: Message): Boolean ={

wechaty/src/main/scala/wechaty/plugins/FriendshipAcceptor.scala

@@ -8,13 +8,16 @@ import wechaty.puppet.schemas.Puppet._
 import wechaty.user.Contact
 import wechaty.{Wechaty, WechatyPlugin}
 
+import scala.concurrent.duration._
+import scala.concurrent.Await
+
 /**
   *
   * @author <a href="mailto:[email protected]">Jun Tsai</a>
   * @since 2020-06-19
   */
 case class FriendshipAcceptorConfig( var greeting:String = "we are friends now!",var waitSeconds:Int=0, var keywordOpt:Option[String]=None)
-class FriendshipAcceptor(config:FriendshipAcceptorConfig) extends WechatyPlugin with StrictLogging{
+class FriendshipAcceptor(config:FriendshipAcceptorConfig,/*for test*/isWait:Boolean=false) extends WechatyPlugin with StrictLogging{
   private def isMatchKeyword(str: String): Boolean ={
     logger.debug("keyword:{} hello:{} ",config.keywordOpt,str)
     config.keywordOpt match{
@@ -29,7 +32,9 @@ class FriendshipAcceptor(config:FriendshipAcceptorConfig) extends WechatyPlugin
     }
   }
   private def doGreeting(contact: Contact): Unit ={
-    contact.say(config.greeting)
+    val future = contact.say(config.greeting)
+    if(isWait)
+      Await.result(future,10 seconds)
   }
   override def install(wechaty: Wechaty): Unit = {
     wechaty.onFriendAdd(friendship => {

wechaty/src/main/scala/wechaty/plugins/RoomConnector.scala

@@ -5,6 +5,9 @@ import wechaty.plugins.RoomConnector._
 import wechaty.user.{Message, Room}
 import wechaty.{Wechaty, WechatyPlugin}
 
+import scala.concurrent.duration._
+import scala.concurrent.Await
+
 /**
   *
   * @author <a href="mailto:[email protected]">Jun Tsai</a>
@@ -22,7 +25,7 @@ object RoomConnector {
   type RoomMessageMapper = (/* from room */Room,Message,/* to room */Room) => Option[Message]
   val  DEFAULT_MESSAGE_SENDER:RoomMessageMapper=(_,msg,_) => Some(msg)
 }
-class RoomConnector(config: RoomConnectorConfig) extends WechatyPlugin with LazyLogging {
+class RoomConnector(config: RoomConnectorConfig,/*only for test*/isWait:Boolean=false) extends WechatyPlugin with LazyLogging {
   override def install(wechaty: Wechaty): Unit = {
     implicit val resolver: Wechaty = wechaty
     wechaty.onOnceMessage(message => {
@@ -35,7 +38,9 @@ class RoomConnector(config: RoomConnectorConfig) extends WechatyPlugin with Lazy
             toRooms foreach { toRoom =>
               config.mapper(fromRoom, roomMessage, toRoom) match {
                 case Some(msg) =>
-                  msg.forward(toRoom)
+                  val future = msg.forward(toRoom)
+                  if(isWait)
+                    Await.result(future,10 seconds)
                 case _ => //filtered,so don't forward message
               }
             }

wechaty/src/main/scala/wechaty/plugins/RoomJoinHello.scala

@@ -3,13 +3,16 @@ package wechaty.plugins
 import com.typesafe.scalalogging.LazyLogging
 import wechaty.{Wechaty, WechatyPlugin}
 
+import scala.concurrent.duration._
+import scala.concurrent.Await
+
 /**
   *
   * @author <a href="mailto:[email protected]">Jun Tsai</a>
   * @since 2020-06-23
   */
 case class RoomJoinHelloConfig( var rooms:Array[String]=Array() ,hello:String="welcome")
-class RoomJoinHello(config:RoomJoinHelloConfig) extends WechatyPlugin with LazyLogging{
+class RoomJoinHello(config:RoomJoinHelloConfig,/*only for test*/isWait:Boolean=false) extends WechatyPlugin with LazyLogging{
   override def install(wechaty: Wechaty): Unit = {
     implicit val resolver:Wechaty = wechaty
     wechaty.onOnceMessage(message=>{
@@ -20,7 +23,11 @@ class RoomJoinHello(config:RoomJoinHelloConfig) extends WechatyPlugin with LazyL
           PluginHelper.executeWithNotThrow("RoomJoinHello") {
             if (list == null || list.isEmpty) {
               logger.warn("invitee list is empty")
-            } else room.say(config.hello, list)
+            } else {
+              val future = room.say(config.hello, list)
+              if(isWait)
+                Await.result(future,10 seconds)
+            }
           }
         }
       })

wechaty/src/main/scala/wechaty/user/Message.scala

@@ -180,7 +180,7 @@ class Message(messageId:String)(implicit resolver: PuppetResolver) extends LazyL
       case _ =>  false
     }
   }
-  def forward (to: Conversation): Unit = {
+  def forward (to: Conversation): Future[String]= {
     resolver.puppet.messageForward(to.id, this.messageId)
   }
   /**

wechaty/src/test/scala/wechaty/plugins/DingDongTest.scala

@@ -62,7 +62,7 @@ class DingDongTest extends TestBase{
   def test_plugin: Unit ={
     val config = new DingDongConfig
     config.room = true
-    instance.use(new DingDongPlugin(config))
+    instance.use(new DingDongPlugin(config,isWait = true))
     mockRoomMessage("#ding")
     mockMessageSendText()
 

wechaty/src/test/scala/wechaty/plugins/FriendshipAcceptorTest.scala

@@ -15,7 +15,7 @@ class FriendshipAcceptorTest extends TestBase{
   @Test
   def test_add: Unit ={
     val config = FriendshipAcceptorConfig()
-    instance.use(new FriendshipAcceptor(config))
+    instance.use(new FriendshipAcceptor(config,isWait = true))
 
     mockFriendshipAdd()
     emitFriendshipAddPayloadEvent()
@@ -46,7 +46,7 @@ class FriendshipAcceptorTest extends TestBase{
   @Test
   def testGreetings: Unit ={
     val config = FriendshipAcceptorConfig()
-    instance.use(new FriendshipAcceptor(config))
+    instance.use(new FriendshipAcceptor(config,isWait = true))
     config.greeting="你好"
 
     mockFriendshipAdd(payloadType = FriendshipType.FRIENDSHIP_TYPE_CONFIRM)

wechaty/src/test/scala/wechaty/plugins/RoomConnectorTest.scala

@@ -15,7 +15,7 @@ class RoomConnectorTest extends TestBase{
   def test_connector: Unit ={
     val connectorConfig = RoomConnectorConfig(Array("from"),Array("to"))
     connectorConfig.blacklist = _ => true
-    instance.use(new RoomConnector(connectorConfig))
+    instance.use(new RoomConnector(connectorConfig,isWait = true))
 
     mockRoomMessage(roomId = "from")
     mockMessageSendText()

wechaty/src/test/scala/wechaty/plugins/RoomJoinHelloTest.scala

@@ -15,7 +15,7 @@ import wechaty.puppet.schemas.Puppet.PuppetEventName
 class RoomJoinHelloTest extends TestBase{
   @Test
   def test_join: Unit ={
-    val roomJoinHello = new RoomJoinHello(RoomJoinHelloConfig(rooms = Array("roomId"),hello = "hello world!"))
+    val roomJoinHello = new RoomJoinHello(RoomJoinHelloConfig(rooms = Array("roomId"),hello = "hello world!"),isWait=true)
     roomJoinHello.install(instance)
 
     mockRoomMessage(roomId = "from")