Merge pull request #695 from square/jwilson.0927.dollar

Don't use @Language when the literal includes a dollar sign
This commit is contained in:
Zac Sweers
2018-09-27 23:41:43 -04:00
committed by GitHub

View File

@@ -65,14 +65,12 @@ class GeneratedAdaptersTest {
val adapter = moshi.adapter(JsonAnnotationWithDollarSign::class.java) val adapter = moshi.adapter(JsonAnnotationWithDollarSign::class.java)
// Read // Read
@Language("JSON")
val json = "{\"\$foo\": \"bar\"}" val json = "{\"\$foo\": \"bar\"}"
val instance = adapter.fromJson(json)!! val instance = adapter.fromJson(json)!!
assertThat(instance.bar).isEqualTo("bar") assertThat(instance.bar).isEqualTo("bar")
// Write // Write
@Language("JSON")
val expectedJson = "{\"\$foo\":\"baz\"}" val expectedJson = "{\"\$foo\":\"baz\"}"
assertThat(adapter.toJson(JsonAnnotationWithDollarSign("baz"))).isEqualTo(expectedJson) assertThat(adapter.toJson(JsonAnnotationWithDollarSign("baz"))).isEqualTo(expectedJson)