Fix bbb-common-message unit tests.

bbb-common-message/src/test/scala/org/bigbluebutton/common2/TestFixtures.scala

@@ -2,7 +2,6 @@ package org.bigbluebutton.common2
 
 import org.bigbluebutton.common2.domain._
 
-
 trait TestFixtures {
   val meetingId = "testMeetingId"
   val externalMeetingId = "testExternalMeetingId"
@@ -12,6 +11,15 @@ trait TestFixtures {
   val record = false
   val voiceConfId = "85115"
   val durationInMinutes = 10
+
+  val maxInactivityTimeoutMinutes = 120
+  val warnMinutesBeforeMax = 30
+  val meetingExpireIfNoUserJoinedInMinutes = 5
+  val meetingExpireWhenLastUserLeftInMinutes = 10
+  val userInactivityInspectTimerInMinutes = 60
+  val userInactivityThresholdInMinutes = 10
+  val userActivitySignResponseDelayInMinutes = 5
+
   val autoStartRecording = false
   val allowStartStopRecording = false
   val webcamsOnlyForModerator = false
@@ -25,19 +33,23 @@ trait TestFixtures {
   val modOnlyMessage = "Moderator only message"
   val dialNumber = "613-555-1234"
   val maxUsers = 25
+  val muteOnStart = false
   val guestPolicy = "ALWAYS_ASK"
   val metadata: collection.immutable.Map[String, String] = Map("foo" -> "bar", "bar" -> "baz", "baz" -> "foo")
 
   val meetingProp = MeetingProp(name = meetingName, extId = externalMeetingId, intId = meetingId,
     isBreakout = isBreakout.booleanValue())
-  val breakoutProps = BreakoutProps(parentId = parentMeetingId, sequence = sequence, breakoutRooms = Vector())
-  val durationProps = DurationProps(duration = durationInMinutes, createdTime = createTime, createdDate = createDate)
+  val breakoutProps = BreakoutProps(parentId = parentMeetingId, sequence = sequence, freeJoin = false, breakoutRooms = Vector())
+
+  val durationProps = DurationProps(duration = durationInMinutes, createdTime = createTime, createdDate = createDate, maxInactivityTimeoutMinutes = maxInactivityTimeoutMinutes, warnMinutesBeforeMax = warnMinutesBeforeMax,
+    meetingExpireIfNoUserJoinedInMinutes = meetingExpireIfNoUserJoinedInMinutes, meetingExpireWhenLastUserLeftInMinutes = meetingExpireWhenLastUserLeftInMinutes,
+    userInactivityInspectTimerInMinutes = userInactivityInspectTimerInMinutes, userInactivityThresholdInMinutes = userInactivityInspectTimerInMinutes, userActivitySignResponseDelayInMinutes = userActivitySignResponseDelayInMinutes)
   val password = PasswordProp(moderatorPass = moderatorPassword, viewerPass = viewerPassword)
   val recordProp = RecordProp(record = record, autoStartRecording = autoStartRecording,
     allowStartStopRecording = allowStartStopRecording)
   val welcomeProp = WelcomeProp(welcomeMsgTemplate = welcomeMsgTemplate, welcomeMsg = welcomeMsg,
     modOnlyMessage = modOnlyMessage)
-  val voiceProp = VoiceProp(telVoice = voiceConfId, voiceConf = voiceConfId, dialNumber = dialNumber)
+  val voiceProp = VoiceProp(telVoice = voiceConfId, voiceConf = voiceConfId, dialNumber = dialNumber, muteOnStart = muteOnStart)
   val usersProp = UsersProp(maxUsers = maxUsers, webcamsOnlyForModerator = webcamsOnlyForModerator,
     guestPolicy = guestPolicy)
   val metadataProp = new MetadataProp(metadata)

bbb-common-message/src/test/scala/org/bigbluebutton/common2/messages/DeserializerTests.scala

 package org.bigbluebutton.common2.messages
 
 import com.fasterxml.jackson.databind.JsonNode
-import org.bigbluebutton.common2.messages.MessageBody.CreateMeetingReqMsgBody
+import org.bigbluebutton.common2.msgs._
 import org.bigbluebutton.common2.util.JsonUtil
-import org.bigbluebutton.common2.{TestFixtures, UnitSpec2}
-
-import scala.util.{Failure, Success}
+import org.bigbluebutton.common2.{ TestFixtures, UnitSpec2 }
 
+import scala.util.{ Failure, Success }
 
 class DeserializerTests extends UnitSpec2 with TestFixtures {
 
@@ -28,7 +27,7 @@ class DeserializerTests extends UnitSpec2 with TestFixtures {
     println(map)
     map match {
       case Success(envJsNodeMsg) => assert(envJsNodeMsg.core.isInstanceOf[JsonNode])
-      case Failure(ex) => fail("Failed to decode json message " + ex)
+      case Failure(ex)           => fail("Failed to decode json message " + ex)
     }
   }
 
@@ -46,11 +45,12 @@ class DeserializerTests extends UnitSpec2 with TestFixtures {
     println(map)
 
     map match {
-      case Success(envJsNodeMsg) => assert(envJsNodeMsg.core.isInstanceOf[JsonNode])
-        val createMeetingReqMsg = Deserializer.toCreateMeetingReqMsg(envJsNodeMsg.envelope, envJsNodeMsg.core)
-        createMeetingReqMsg match {
+      case Success(envJsNodeMsg) =>
+        assert(envJsNodeMsg.core.isInstanceOf[JsonNode])
+        val (msg, exception) = Deserializer.toBbbCommonMsg[CreateMeetingReqMsg](envJsNodeMsg.core)
+        msg match {
           case Some(cmrq) => assert(cmrq.isInstanceOf[CreateMeetingReqMsg])
-          case None => fail("Failed to decode CreateMeetingReqMsg")
+          case None       => fail("Failed to decode CreateMeetingReqMsg")
         }
       case Failure(ex) => fail("Failed to decode json message " + ex)
     }
@@ -71,11 +71,12 @@ class DeserializerTests extends UnitSpec2 with TestFixtures {
     println(map)
 
     map match {
-      case Success(envJsNodeMsg) => assert(envJsNodeMsg.core.isInstanceOf[JsonNode])
+      case Success(envJsNodeMsg) =>
+        assert(envJsNodeMsg.core.isInstanceOf[JsonNode])
         val (msg, exception) = Deserializer.toBbbCommonMsg[CreateMeetingReqMsg](envJsNodeMsg.core)
         msg match {
           case Some(cmrq) => assert(cmrq.isInstanceOf[CreateMeetingReqMsg])
-          case None => fail("Should have successfully decoded CreateMeetingReqMsg ")
+          case None       => fail("Should have successfully decoded CreateMeetingReqMsg ")
         }
       case Failure(ex) => fail("Failed to decode json message " + ex)
     }
@@ -103,7 +104,7 @@ class DeserializerTests extends UnitSpec2 with TestFixtures {
     val (result, error) = Deserializer.toBbbCoreMessageFromClient(jsonMsg)
     result match {
       case Some(msg) => assert(msg.header.name == "foo")
-      case None => fail("Should have deserialized message but failed with error: " + error)
+      case None      => fail("Should have deserialized message but failed with error: " + error)
     }
   }
 }

bbb-common-message/src/test/scala/org/bigbluebutton/common2/util/JsonUtilTest.scala

 package org.bigbluebutton.common2.util
 
-import org.bigbluebutton.common2.{TestFixtures, UnitSpec2}
-import org.bigbluebutton.common2.messages._
+import org.bigbluebutton.common2.{ TestFixtures, UnitSpec2 }
+import org.bigbluebutton.common2.msgs._
 
 import scala.collection.immutable.List
 import com.fasterxml.jackson.databind.JsonNode
-import org.bigbluebutton.common2.messages.MessageBody.ValidateAuthTokenReqMsgBody
-
-import scala.util.{Failure, Success}
 
+import scala.util.{ Failure, Success }
 
 case class Person(name: String, age: Int)
 case class Group(name: String, persons: Seq[Person], leader: Person)
@@ -26,7 +24,7 @@ class JsonUtilTest extends UnitSpec2 with TestFixtures {
     // map: Map[String,Seq[Int]] = Map(a -> List(1, 2), b -> List(3, 4, 5), c -> List())
     println(map)
     map match {
-      case Success(a) => assert(a.values.size == 3)
+      case Success(a)  => assert(a.values.size == 3)
       case Failure(ex) => fail("Failed to decode json message")
     }
   }
@@ -38,7 +36,7 @@ class JsonUtilTest extends UnitSpec2 with TestFixtures {
     val jeroen = Person("Jeroen", 26)
     val martin = Person("Martin", 54)
 
-    val originalGroup = Group("Scala ppl", Seq(jeroen,martin), martin)
+    val originalGroup = Group("Scala ppl", Seq(jeroen, martin), martin)
     // originalGroup: Group = Group(Scala ppl,List(Person(Jeroen,26), Person(Martin,54)),Person(Martin,54))
     println(originalGroup)
 
@@ -52,7 +50,7 @@ class JsonUtilTest extends UnitSpec2 with TestFixtures {
   }
 
   "JsonUtil" should "unmarshall a ValidateAuthTokenReq" in {
-    val header: BbbCoreHeaderWithMeetingId = new BbbCoreHeaderWithMeetingId("foo", "mId")
+    val header: BbbClientMsgHeader = new BbbClientMsgHeader("foo", "mId", "uId")
     val body: ValidateAuthTokenReqMsgBody = new ValidateAuthTokenReqMsgBody(userId = "uId", authToken = "myToken")
     val msg: ValidateAuthTokenReqMsg = new ValidateAuthTokenReqMsg(header, body)
     val json = JsonUtil.toJson(msg)