Skip to content

Commit efeb7be

Browse files
committed
Clean up of tests
1 parent 03e5c8b commit efeb7be

File tree

1 file changed

+20
-22
lines changed
  • core/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/core

1 file changed

+20
-22
lines changed

core/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/core/UserAPI.scala

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ object UserAPI {
1818
private val r0: Array[String] = Array("name")
1919
private val r1: Array[String] = Array("id", "model")
2020

21-
def nullValue: User = null
21+
val nullValue: User = null
2222

2323
def decodeValue(in: JsonReader, default: User): User = d0(in, default)
2424

@@ -93,15 +93,14 @@ object UserAPI {
9393
else in.requiredKeyError(r0, Array(req0))
9494
} else in.readNullOrTokenError(default, '{')
9595

96-
private def e2(x: Device, out: JsonWriter): Unit =
97-
if (x ne null) {
98-
out.writeObjectStart()
99-
out.writeNonEscapedAsciiKey("id")
100-
out.writeVal(x.id)
101-
out.writeNonEscapedAsciiKey("model")
102-
out.writeVal(x.model)
103-
out.writeObjectEnd()
104-
} else out.writeNull()
96+
private def e2(x: Device, out: JsonWriter): Unit = {
97+
out.writeObjectStart()
98+
out.writeNonEscapedAsciiKey("id")
99+
out.writeVal(x.id)
100+
out.writeNonEscapedAsciiKey("model")
101+
out.writeVal(x.model)
102+
out.writeObjectEnd()
103+
}
105104

106105
private def e1(x: Seq[Device], out: JsonWriter): Unit = {
107106
out.writeArrayStart()
@@ -112,17 +111,16 @@ object UserAPI {
112111
out.writeArrayEnd()
113112
}
114113

115-
private def e0(x: User, out: JsonWriter): Unit =
116-
if (x ne null) {
117-
out.writeObjectStart()
118-
out.writeNonEscapedAsciiKey("name")
119-
out.writeVal(x.name)
120-
val v = x.devices
121-
if ((v ne null) && !v.isEmpty) {
122-
out.writeNonEscapedAsciiKey("devices")
123-
e1(v, out)
124-
}
125-
out.writeObjectEnd()
126-
} else out.writeNull()
114+
private def e0(x: User, out: JsonWriter): Unit = {
115+
out.writeObjectStart()
116+
out.writeNonEscapedAsciiKey("name")
117+
out.writeVal(x.name)
118+
val v = x.devices
119+
if (!v.isEmpty) {
120+
out.writeNonEscapedAsciiKey("devices")
121+
e1(v, out)
122+
}
123+
out.writeObjectEnd()
124+
}
127125
}
128126
}

0 commit comments

Comments
 (0)