Simplify UVM extension output generator

emlun · emlun · commit 3e21575b386a · 2023-01-19T16:52:10.000+01:00
diff --git a/webauthn-server-core/src/test/scala/com/yubico/webauthn/data/Generators.scala b/webauthn-server-core/src/test/scala/com/yubico/webauthn/data/Generators.scala
@@ -887,12 +887,9 @@ object Generators {
 
       def authenticatorOutput: Gen[CBORObject] =
         for {
-          entry1 <- uvmEntry
-          entry23 <- Gen.listOfN(2, uvmEntry)
+          entries <- Gen.resize(3, Gen.nonEmptyListOf(uvmEntry))
         } yield {
-          CBORObject.FromObject(
-            Array(encodeUvmEntry(entry1)) ++ (entry23.map(encodeUvmEntry))
-          )
+          CBORObject.FromObject(entries.map(encodeUvmEntry).toArray)
         }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -887,12 +887,9 @@ object Generators {`
`887`	`887`
`888`	`888`	`def authenticatorOutput: Gen[CBORObject] =`
`889`	`889`	`for {`
`890`		`- entry1 <- uvmEntry`
`891`		`- entry23 <- Gen.listOfN(2, uvmEntry)`
	`890`	`+ entries <- Gen.resize(3, Gen.nonEmptyListOf(uvmEntry))`
`892`	`891`	`} yield {`
`893`		`- CBORObject.FromObject(`
`894`		`- Array(encodeUvmEntry(entry1)) ++ (entry23.map(encodeUvmEntry))`
`895`		`- )`
	`892`	`+ CBORObject.FromObject(entries.map(encodeUvmEntry).toArray)`
`896`	`893`	`}`
`897`	`894`	`}`
`898`	`895`	`}`