improved testing of BsonTypeMetadata to expect multiple types

Author: Roman Janusz

commons-mongo/jvm/src/test/scala/com/avsystem/commons/mongo/BsonInputOutputTest.scala

@@ -194,9 +194,9 @@ class BsonInputOutputTest extends AnyFunSuite with ScalaCheckPropertyChecks {
 
 
   def testMetadata(input: BsonInput)(implicit position: Position): Unit = {
-    def testFieldType(input: ObjectInput)(tpe: BsonType): Unit = {
+    def testFieldType(input: ObjectInput)(tpes: BsonType*): Unit = {
       val fieldInput = input.nextField()
-      assert(fieldInput.readMetadata(BsonTypeMetadata).contains(tpe))
+      assert(fieldInput.readMetadata(BsonTypeMetadata).exists(tpes.contains))
       fieldInput.skip()
     }
 
@@ -217,7 +217,7 @@ class BsonInputOutputTest extends AnyFunSuite with ScalaCheckPropertyChecks {
     testFieldType(objectInput)(BsonType.STRING)
     testFieldType(objectInput)(BsonType.BOOLEAN)
     testFieldType(objectInput)(BsonType.INT32)
-    testFieldType(objectInput)(BsonType.INT64)
+    testFieldType(objectInput)(BsonType.INT32, BsonType.INT64)
     testFieldType(objectInput)(BsonType.DATE_TIME)
     testFieldType(objectInput)(BsonType.DOUBLE)
     testFieldType(objectInput)(BsonType.BINARY)

commons-mongo/jvm/src/test/scala/com/avsystem/commons/mongo/SomethingPlain.scala

@@ -33,10 +33,7 @@ object SomethingPlain extends HasGenCodec[SomethingPlain] {
     string <- arbitrary[String]
     boolean <- arbitrary[Boolean]
     int <- arbitrary[Int]
-    long <- Gen.oneOf(
-      Gen.choose(Long.MinValue, Int.MinValue - 1L),
-      Gen.choose(Int.MaxValue + 1L, Long.MaxValue),
-    )
+    long <- arbitrary[Long]
     timestamp <- arbitrary[JDate]
     double <- arbitrary[Double]
     binary <- Gen.buildableOf[Array[Byte], Byte](arbitrary[Byte]).map(new Bytes(_))