From 4c647930152dbb9a73a361c1e308a59c348c2c1d Mon Sep 17 00:00:00 2001
From: Botond Baranyi <botond.baranyi@ericsson.com>
Date: Tue, 13 Dec 2016 13:01:17 +0100
Subject: [PATCH] Set printing of JSON encvalue to compact (bug 509146)
Change-Id: Ifa0de9a95195556a5368d786d552d78f1b4542ed
Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>
---
compiler2/Type.cc | 2 +-
regression_test/customEncoding/Custom1.ttcn | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/compiler2/Type.cc b/compiler2/Type.cc
index 682bccb74..491eed4ce 100644
--- a/compiler2/Type.cc
+++ b/compiler2/Type.cc
@@ -4573,7 +4573,7 @@ namespace Common {
coding_str = "XER, XER_EXTENDED"; // TODO: fine tuning this parameter
break;
case CT_JSON:
- coding_str = "JSON";
+ coding_str = "JSON, FALSE"; // with compact printing
break;
case CT_BER: {
coding_str = "BER, ";
diff --git a/regression_test/customEncoding/Custom1.ttcn b/regression_test/customEncoding/Custom1.ttcn
index c26b7b56f..168ecaef8 100644
--- a/regression_test/customEncoding/Custom1.ttcn
+++ b/regression_test/customEncoding/Custom1.ttcn
@@ -254,7 +254,7 @@ external function f_dec_seq(in octetstring x) return Seq
testcase tc_asn() runs on CT
{
var Seq x := { num := 10, str := "abc" };
- var bitstring enc_exp := oct2bit(char2oct("{\n\t\"num\" : 10,\n\t\"str\" : \"abc\"\n}"));
+ var bitstring enc_exp := oct2bit(char2oct("{\"num\":10,\"str\":\"abc\"}"));
var Seq dec_exp := x;
var bitstring enc := encvalue(x);
--
GitLab