From f08f0f04867b070ce38262d34f52ecca11701dd4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Sat, 22 Jul 2017 08:57:00 -0400 Subject: [PATCH] frontend: don't mention JSON in general deserialization error MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- src/frontend/serialization_code_gen_phase.nit | 2 +- .../niti/test_json_deserialization_plain_alt2.res | 2 +- tests/sav/test_json_deserialization_plain_alt2.res | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/frontend/serialization_code_gen_phase.nit b/src/frontend/serialization_code_gen_phase.nit index 253a3a1..77ff746 100644 --- a/src/frontend/serialization_code_gen_phase.nit +++ b/src/frontend/serialization_code_gen_phase.nit @@ -110,7 +110,7 @@ do v.errors.add new AttributeMissingError(self, "{{{name}}}") end""" else code.add """ - v.errors.add new Error("Deserialization Error: attribute `{class_name}::{{{name}}}` missing from JSON object")""" + v.errors.add new AttributeMissingError(self, "{{{name}}}")""" code.add """ else if not {{{name}}} isa {{{type_name}}} then diff --git a/tests/sav/niti/test_json_deserialization_plain_alt2.res b/tests/sav/niti/test_json_deserialization_plain_alt2.res index a6ae660..c5bbcb5 100644 --- a/tests/sav/niti/test_json_deserialization_plain_alt2.res +++ b/tests/sav/niti/test_json_deserialization_plain_alt2.res @@ -1,3 +1,3 @@ Runtime error: Uninitialized attribute _s (alt/test_json_deserialization_plain_alt2.nit:27) # JSON: {"__class": "MyClass", "i": 123, "o": null} -# Errors: 'Deserialization Error: attribute `MyClass::s` missing from JSON object', 'Deserialization Error: attribute `MyClass::f` missing from JSON object', 'Deserialization Error: attribute `MyClass::a` missing from JSON object' +# Errors: 'Deserialization Error: Missing attribute `MyClass::s`', 'Deserialization Error: Missing attribute `MyClass::f`', 'Deserialization Error: Missing attribute `MyClass::a`' diff --git a/tests/sav/test_json_deserialization_plain_alt2.res b/tests/sav/test_json_deserialization_plain_alt2.res index 4b53f0f..190b5f4 100644 --- a/tests/sav/test_json_deserialization_plain_alt2.res +++ b/tests/sav/test_json_deserialization_plain_alt2.res @@ -1,3 +1,3 @@ Runtime error: Uninitialized attribute _s (alt/test_json_deserialization_plain_alt2.nit:22) # JSON: {"__class": "MyClass", "i": 123, "o": null} -# Errors: 'Deserialization Error: attribute `MyClass::s` missing from JSON object', 'Deserialization Error: attribute `MyClass::f` missing from JSON object', 'Deserialization Error: attribute `MyClass::a` missing from JSON object' +# Errors: 'Deserialization Error: Missing attribute `MyClass::s`', 'Deserialization Error: Missing attribute `MyClass::f`', 'Deserialization Error: Missing attribute `MyClass::a`' -- 1.7.9.5