diff options
| author | Kozoriz <kozorizandriy@gmail.com> | 2016-03-07 10:30:33 +0200 |
|---|---|---|
| committer | Kozoriz <kozorizandriy@gmail.com> | 2016-03-10 13:28:45 +0200 |
| commit | 358ca6459aa2e9b2fe9ace737cc396937311c014 (patch) | |
| tree | 3adbd1450ddbd0720eb28d466ca924769bbae134 /src/components/formatters | |
| parent | 7379c58a4089209b4c6b714014de237b8fa720e7 (diff) | |
| download | sdl_core-358ca6459aa2e9b2fe9ace737cc396937311c014.tar.gz | |
Remove singleton from Logger
Removed singleton form LogMessageLoopThread.
Corrected dependencies.
Now logger initialization must get 2 args.
2nd with bool which know about logs-enabled or no.
Related to : APPLINK-21915
Diffstat (limited to 'src/components/formatters')
| -rw-r--r-- | src/components/formatters/test/CFormatterJsonBase_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/formatters/test/CFormatterJsonBase_test.cc b/src/components/formatters/test/CFormatterJsonBase_test.cc index 5378d5ea0d..366c305e0b 100644 --- a/src/components/formatters/test/CFormatterJsonBase_test.cc +++ b/src/components/formatters/test/CFormatterJsonBase_test.cc @@ -207,7 +207,7 @@ TEST(CFormatterJsonBaseTest, JSonObjectValueToSmartObj_ExpectSuccessful) { EXPECT_EQ(*it, *it1); ++it1; } - ASSERT(it == mems.end() && it1 == keys.end()); + EXPECT_TRUE(it == mems.end() && it1 == keys.end()); } TEST(CFormatterJsonBaseTest, StringSmartObjectToJSon_ExpectSuccessful) { @@ -345,7 +345,7 @@ TEST(CFormatterJsonBaseTest, JSonObjectValueToObj_ExpectSuccessful) { EXPECT_EQ(*it, *it1); ++it1; } - ASSERT(it == mems.end() && it1 == keys.end()); + EXPECT_TRUE(it == mems.end() && it1 == keys.end()); } } // namespace formatters |