More test assertions for generic and named tuples

Author: plokhotnyuk

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

@@ -68,8 +68,12 @@ class JsonCodecMakerNewTypeSpec extends VerifyingSpec {
       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.Append[(Byte, Short), Int]], (1: Byte, 2: Short, 3), "[1,2,3]")
       verifySerDeser(make[Tuple.Drop[(Long, Int, String), 1]], (1, "VVV"), """[1,"VVV"]""")
       verifySerDeser(make[Tuple.Take[(Int, String, Long), 2]], (1, "VVV"), """[1,"VVV"]""")
+      verifySerDeser(make[Tuple.Zip[Tuple1[Int], Tuple1[String]]], (1, "VVV") *: EmptyTuple, """[[1,"VVV"]]""")
+      verifySerDeser(make[Tuple.Map[(Int, String), Option]], (Some(1), Some("VVV")), """[1,"VVV"]""")
+      verifySerDeser(make[Tuple.InverseMap[(Option[Int], Option[String]), Option]], (1, "VVV"), """[1,"VVV"]""")
     }
     "serialize and deserialize immutable arrays" in {
       val json = """{"aa":[[1,2],[3,4]],"a":[1,2,3,4]}"""

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

@@ -10,25 +10,20 @@ class JsonCodecMakerNamedTupleSpec extends VerifyingSpec {
       verifySerDeser(make[(i: Int)], (i = 1), """{"i":1}""")
       verifySerDeser(make[(i: Int, s: String)], (i = 1, s = "VVV"), """{"i":1,"s":"VVV"}""")
     }
-    "serialize and deserialize tuples derived from named tuples" in {
-      verifySerDeser(make[NamedTuple.DropNames[(i: Int, s: String)]], (1, "VVV"), """[1,"VVV"]""")
-    }
-    "serialize and deserialize tuples derived from tuples" in {
-      verifySerDeser(make[Tuple.Reverse[(Long, Int, Short, Byte)]], (1: Byte, 2: Short, 3, 4L), """[1,2,3,4]""")
-    }
     "serialize and deserialize generic named tuples" in {
       type GenericNamedTuple[A, B] = (a: A, b: B)
 
-      verifySerDeser(make[GenericNamedTuple[Option[Int], List[String]]], (a = Some(1), b = List("VVV")),
-        """{"a":1,"b":["VVV"]}""")
+      verifySerDeser(make[GenericNamedTuple[Option[Int], List[String]]], (a = Some(1), b = List("VVV")), """{"a":1,"b":["VVV"]}""")
     }
     "serialize and deserialize higher-kind named tuples" in {
       type HKNamedTuple[F[_], G[_]] = (i: F[Int], s: G[String])
 
-      verifySerDeser(make[HKNamedTuple[Option, List]], (i = Some(1), s = List("VVV")),
-        """{"i":1,"s":["VVV"]}""")
+      verifySerDeser(make[HKNamedTuple[Option, List]], (i = Some(1), s = List("VVV")), """{"i":1,"s":["VVV"]}""")
     }
     "serialize and deserialize complex named tuples" in {
+      case class Record(i: Int, s: String)
+
+      verifySerDeser(make[NamedTuple.From[Record]], (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"}""")
@@ -47,6 +42,8 @@ class JsonCodecMakerNamedTupleSpec extends VerifyingSpec {
         ((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"]}""")
+      verifySerDeser(make[NamedTuple.Map[(i: Int, s: String), Option]],
+        (i = Some(1), s = Some("VVV")), """{"i":1,"s":"VVV"}""")
     }
     "serialize and deserialize nested named tuples" in {
       verifySerDeser(make[(i: Int, t: (d: Double, s: String))], (i = 1, t = (d = 2.0, s = "VVV")),
@@ -71,5 +68,10 @@ class JsonCodecMakerNamedTupleSpec extends VerifyingSpec {
       verifySerDeser(make[List[(i: Int, s: String)]], List((i = 1, s = "VVV"), (i = 2, s = "WWW")),
         """[{"i":1,"s":"VVV"},{"i":2,"s":"WWW"}]""")
     }
+    "serialize and deserialize generic and named tuples" in {
+      verifySerDeser(make[Tuple.++[(Byte, Short), (Int, Long)]], (1: Byte, 2: Short, 3, 4L), "[1,2,3,4]")
+      verifySerDeser(make[Tuple.Reverse[(String, Int)]], (1, "VVV"), """[1,"VVV"]""")
+      verifySerDeser(make[NamedTuple.DropNames[(i: Int, s: String)]], (1, "VVV"), """[1,"VVV"]""")
+    }
   }
 }