------------------------------------------------------------ revno: 13140 revision-id: squidadm@squid-cache.org-20131119011254-hkstj9qx7am7e05j parent: kinkie@squid-cache.org-20131118170355-9xid3c8amxstwl2z committer: Automatic source maintenance branch nick: trunk timestamp: Mon 2013-11-18 18:12:54 -0700 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20131119011254-\ # hkstj9qx7am7e05j # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: d47f0562fa4b5222cc8114a879664d91979f4c5a # timestamp: 2013-11-19 01:54:19 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: kinkie@squid-cache.org-20131118170355-\ # 9xid3c8amxstwl2z # # Begin patch === modified file 'src/tests/testConfigParser.cc' --- src/tests/testConfigParser.cc 2013-11-18 17:03:55 +0000 +++ src/tests/testConfigParser.cc 2013-11-19 01:12:54 +0000 @@ -58,15 +58,15 @@ // This is a quoted "string" by me CPPUNIT_ASSERT_EQUAL(true, doParseQuotedTest("\"This is a quoted \\\"string\\\" by me\"", - "This is a quoted \"string\" by me")); + "This is a quoted \"string\" by me")); // escape sequence test: \\"\"\\" CPPUNIT_ASSERT_EQUAL(true, doParseQuotedTest("\"escape sequence test: \\\\\\\\\\\"\\\\\\\"\\\\\\\\\\\"\"", - "escape sequence test: \\\\\"\\\"\\\\\"")); + "escape sequence test: \\\\\"\\\"\\\\\"")); // \beginning and end test" CPPUNIT_ASSERT_EQUAL(true, doParseQuotedTest("\"\\\\beginning and end test\\\"\"", - "\\beginning and end test\"")); + "\\beginning and end test\"")); // " CPPUNIT_ASSERT_EQUAL(true, doParseQuotedTest("\"\\\"\"", "\""));