Clean up of tests for Scala 3

Author: plokhotnyuk

jsoniter-scala-macros/shared/src/test/scala-3/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMakerNewTypeSpec.scala

@@ -57,37 +57,37 @@ class JsonCodecMakerNewTypeSpec extends VerifyingSpec {
   val codecOfIArrays = make[IArrays]
 
   "JsonCodecMaker.make generate codecs which" should {
-    "serialize and deserialize Scala 3 tuples with arities greater than 22" in {
+    "serialize and deserialize tuples with arities greater than 22" in {
       verifySerDeser(make[(Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, String)],
         (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, "24"),
         """[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,"24"]""")
     }
-    "serialize and deserialize Scala 3 generic tuples" in {
+    "serialize and deserialize generic tuples" in {
       verifySerDeser(make[EmptyTuple], EmptyTuple, "[]")
       verifySerDeser(make[Tuple.Drop[(Long, Int, String), 3]], EmptyTuple, "[]")
-      verifySerDeser(make[Byte *: Short *: Int *: Long *: EmptyTuple], (1: Byte) *: (2: Short) *: 3 *: 4L *: EmptyTuple, "[1,2,3,4]")
-      verifySerDeser(make[Byte *: Short *: Tuple2[Int, Long]], (1: Byte) *: (2: Short) *: (3, 4L), "[1,2,3,4]")
+      verifySerDeser(make[Byte *: Short *: Int *: Long *: EmptyTuple], (1: Byte, 2: Short, 3, 4L), "[1,2,3,4]")
+      verifySerDeser(make[Byte *: Short *: Tuple2[Int, Long]], (1: Byte, 2: Short, 3, 4L), "[1,2,3,4]")
       verifySerDeser(make[Tuple.Concat[(Byte, Short), (Int, Long)]], (1: Byte, 2: Short, 3, 4L), "[1,2,3,4]")
       verifySerDeser(make[Tuple.Drop[(Long, Int, String), 1]], (1, "VVV"), """[1,"VVV"]""")
       verifySerDeser(make[Tuple.Take[(Int, String, Long), 2]], (1, "VVV"), """[1,"VVV"]""")
     }
-    "serialize and deserialize Scala 3 immutable array" in {
+    "serialize and deserialize immutable arrays" in {
       val json = """{"aa":[[1,2],[3,4]],"a":[1,2,3,4]}"""
       val iArrays = IArrays(IArray(IArray[Int](1, 2), IArray[Int](3, 4)), IArray[BigInt](1, 2, 3, 4))
       verifySer(codecOfIArrays, iArrays, json)
       val parsedObj = readFromString(json)(codecOfIArrays)
       parsedObj.aa shouldBe iArrays.aa
       parsedObj.a shouldBe iArrays.a
     }
-    "don't serialize fields of case classes with empty Scala 3 immutable arrays" in {
+    "don't serialize fields of case classes with empty immutable arrays" in {
       val json = """{"aa":[[],[]]}"""
       val iArrays = IArrays(IArray(IArray[Int](), IArray[Int]()), IArray[BigInt]())
       verifySer(codecOfIArrays, iArrays, json)
       val parsedObj = readFromString(json)(codecOfIArrays)
       parsedObj.aa shouldBe iArrays.aa
       parsedObj.a shouldBe iArrays.a
     }
-    "serialize fields of case classes with empty Scala 3 immutable arrays when transientEmpty is off" in {
+    "serialize fields of case classes with empty immutable arrays when transientEmpty is off" in {
       val json = """{"aa":[[],[]],"a":[]}"""
       val iArrays = IArrays(IArray(IArray[Int](), IArray[Int]()), IArray[BigInt]())
       verifySer(make[IArrays](CodecMakerConfig.withTransientEmpty(false)), iArrays, json)

jsoniter-scala-next-tests/shared/src/test/scala-3/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMakerNamedTupleSpec.scala

@@ -9,24 +9,6 @@ class JsonCodecMakerNamedTupleSpec extends VerifyingSpec {
       verifySerDeser(make[NamedTuple.Empty], EmptyTuple, """{}""")
       verifySerDeser(make[(i: Int)], (i = 1), """{"i":1}""")
       verifySerDeser(make[(i: Int, s: String)], (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
-      verifySerDeser(make[NamedTuple.Reverse[(i: Int, s: String)]], (s = "VVV", i = 1), """{"s":"VVV","i":1}""")
-      verifySerDeser(make[NamedTuple.Concat[(i: Int), (s: String)]], (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
-      verifySerDeser(make[NamedTuple.Tail[(l: Long, i: Int, s: String)]], (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
-      verifySerDeser(make[NamedTuple.Init[(i: Int, s: String, l: Long)]], (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
-      verifySerDeser(make[NamedTuple.Drop[(l: Long, i: Int, s: String), 1]], (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
-      verifySerDeser(make[NamedTuple.Take[(i: Int, s: String, l: Long), 2]], (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
-      verifySerDeser(make[NamedTuple.NamedTuple["i" *: "s" *: EmptyTuple, (Int, String)]],
-        (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
-      verifySerDeser(make[NamedTuple.NamedTuple["i" *: ("s", "l"), (Int, String, Long)]],
-        (i = 1, s = "VVV", l = 2L), """{"i":1,"s":"VVV","l":2}""")
-      verifySerDeser(make[NamedTuple.NamedTuple[("i", "s"), Int *: String *: EmptyTuple]],
-        (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
-      verifySerDeser(make[NamedTuple.NamedTuple[("i", "s", "l"), Int *: Tuple2[String, Long]]],
-        (i = 1, s = "VVV", l = 2L), """{"i":1,"s":"VVV","l":2}""")
-      verifySerDeser(make[NamedTuple.Split[(i: Int, s: String, l: Long), 2]],
-        ((i = 1, s = "VVV"), (l = 2L)), """[{"i":1,"s":"VVV"},{"l":2}]""")
-      verifySerDeser(make[NamedTuple.Zip[(i: Int, s: String), (i: Long, s: String)]],
-        (i = (1, 2L), s = ("VVV", "WWW")), """{"i":[1,2],"s":["VVV","WWW"]}""")
     }
     "serialize and deserialize tuples derived from named tuples" in {
       verifySerDeser(make[NamedTuple.DropNames[(i: Int, s: String)]], (1, "VVV"), """[1,"VVV"]""")
@@ -46,6 +28,26 @@ class JsonCodecMakerNamedTupleSpec extends VerifyingSpec {
       verifySerDeser(make[HKNamedTuple[Option, List]], (i = Some(1), s = List("VVV")),
         """{"i":1,"s":["VVV"]}""")
     }
+    "serialize and deserialize complex named tuples" in {
+      verifySerDeser(make[NamedTuple.Reverse[(i: Int, s: String)]], (s = "VVV", i = 1), """{"s":"VVV","i":1}""")
+      verifySerDeser(make[NamedTuple.Concat[(i: Int), (s: String)]], (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
+      verifySerDeser(make[NamedTuple.Tail[(l: Long, i: Int, s: String)]], (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
+      verifySerDeser(make[NamedTuple.Init[(i: Int, s: String, l: Long)]], (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
+      verifySerDeser(make[NamedTuple.Drop[(l: Long, i: Int, s: String), 1]], (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
+      verifySerDeser(make[NamedTuple.Take[(i: Int, s: String, l: Long), 2]], (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
+      verifySerDeser(make[NamedTuple.NamedTuple["i" *: "s" *: EmptyTuple, (Int, String)]],
+        (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
+      verifySerDeser(make[NamedTuple.NamedTuple["i" *: ("s", "l"), (Int, String, Long)]],
+        (i = 1, s = "VVV", l = 2L), """{"i":1,"s":"VVV","l":2}""")
+      verifySerDeser(make[NamedTuple.NamedTuple[("i", "s"), Int *: String *: EmptyTuple]],
+        (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
+      verifySerDeser(make[NamedTuple.NamedTuple[("i", "s", "l"), Int *: Tuple2[String, Long]]],
+        (i = 1, s = "VVV", l = 2L), """{"i":1,"s":"VVV","l":2}""")
+      verifySerDeser(make[NamedTuple.Split[(i: Int, s: String, l: Long), 2]],
+        ((i = 1, s = "VVV"), (l = 2L)), """[{"i":1,"s":"VVV"},{"l":2}]""")
+      verifySerDeser(make[NamedTuple.Zip[(i: Int, s: String), (i: Long, s: String)]],
+        (i = (1, 2L), s = ("VVV", "WWW")), """{"i":[1,2],"s":["VVV","WWW"]}""")
+    }
     "serialize and deserialize nested named tuples" in {
       verifySerDeser(make[(i: Int, t: (d: Double, s: String))], (i = 1, t = (d = 2.0, s = "VVV")),
         """{"i":1,"t":{"d":2.0,"s":"VVV"}}""")