summaryrefslogtreecommitdiff
path: root/tools/intergen
diff options
context:
space:
mode:
authorJackLivio <jack@livio.io>2018-02-02 17:30:25 -0500
committerGitHub <noreply@github.com>2018-02-02 17:30:25 -0500
commit14d1e87aa0e5b48bb2263a2b6899c474df9c185c (patch)
treed7ae8950ef85a9f95087fe29d8032471ae6e59c4 /tools/intergen
parent21dfde7e8b8e81055d74f9b15db7c19d2e5075ee (diff)
parentf628d402af6711ac6eb6c06887bba8b6cf82594a (diff)
downloadsdl_core-14d1e87aa0e5b48bb2263a2b6899c474df9c185c.tar.gz
Merge branch 'develop' into hotfix/dynamically_link_librarieshotfix/dynamically_link_libraries
Diffstat (limited to 'tools/intergen')
-rw-r--r--tools/intergen/test/generated_interface_json_tests.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/intergen/test/generated_interface_json_tests.cc b/tools/intergen/test/generated_interface_json_tests.cc
index 995ff17e8b..ee1db2167b 100644
--- a/tools/intergen/test/generated_interface_json_tests.cc
+++ b/tools/intergen/test/generated_interface_json_tests.cc
@@ -545,7 +545,7 @@ TEST_F(GeneratedInterfaceTests, ReportIncorrectlyInitializedMap1) {
ASSERT_FALSE(smim.is_valid());
rpc::ValidationReport report("smim");
smim.ReportErrors(&report);
- ASSERT_EQ("smim.mandatoryIntMap: object is not initialized\n", PrettyFormat(report));
+ ASSERT_EQ("smim.mandatoryIntMap: object is not initialized", PrettyFormat(report));
}
TEST_F(GeneratedInterfaceTests, ReportIncorrectlyInitializedMap2) {
@@ -556,7 +556,7 @@ TEST_F(GeneratedInterfaceTests, ReportIncorrectlyInitializedMap2) {
ASSERT_EQ("c: object is not initialized\n"
"c.choiceID: value is not initialized\n"
"c.menuName: value is not initialized\n"
- "c.vrCommands: object is not initialized\n", PrettyFormat(report));
+ "c.vrCommands: object is not initialized", PrettyFormat(report));
}
TEST_F(GeneratedInterfaceTests, TestFrankenstructCreation) {
@@ -621,7 +621,7 @@ TEST_F(GeneratedInterfaceTests, FrankenstructFromInvalidJson) {
ASSERT_EQ(2, fbmi.mandatoryInt);
rpc::ValidationReport report("fbmi");
fbmi.ReportErrors(&report);
- ASSERT_EQ("fbmi[\"hello\"]: value initialized incorrectly\n", PrettyFormat(report));
+ ASSERT_EQ("fbmi[\"hello\"]: value initialized incorrectly", PrettyFormat(report));
}
} // namespace test