From: JINMEI Tatuya Date: Tue, 4 Dec 2012 04:01:45 +0000 (-0800) Subject: [2442] updated some TXT-like test data without using intermediate space. X-Git-Tag: bind10-1.0.0-beta-release~39^2~3^2~1^2~2^2~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f8aabb7951987f3e247ad4263e259d82211e5b3;p=thirdparty%2Fkea.git [2442] updated some TXT-like test data without using intermediate space. when we migrate the complete lexer version, this will cause confusion: the lexer will consider the space as a separater. --- diff --git a/src/lib/dns/tests/rdata_txt_like_unittest.cc b/src/lib/dns/tests/rdata_txt_like_unittest.cc index b894faebd6..f59163f4d0 100644 --- a/src/lib/dns/tests/rdata_txt_like_unittest.cc +++ b/src/lib/dns/tests/rdata_txt_like_unittest.cc @@ -17,17 +17,19 @@ #include #include #include -#include #include #include +#include + using isc::UnitTestUtil; using namespace std; using namespace isc::dns; using namespace isc::util; using namespace isc::dns::rdata; +namespace { template class RRTYPE : public RRType { @@ -38,37 +40,31 @@ public: template<> RRTYPE::RRTYPE() : RRType(RRType::TXT()) {} template<> RRTYPE::RRTYPE() : RRType(RRType::SPF()) {} -namespace { const uint8_t wiredata_txt_like[] = { - sizeof("Test String") - 1, - 'T', 'e', 's', 't', ' ', 'S', 't', 'r', 'i', 'n', 'g' + sizeof("Test-String") - 1, + 'T', 'e', 's', 't', '-', 'S', 't', 'r', 'i', 'n', 'g' }; const uint8_t wiredata_nulltxt[] = { 0 }; -vector wiredata_longesttxt(256, 'a'); template class Rdata_TXT_LIKE_Test : public RdataTest { protected: - Rdata_TXT_LIKE_Test() { + Rdata_TXT_LIKE_Test() : + wiredata_longesttxt(256, 'a'), + rdata_txt_like("Test-String"), + rdata_txt_like_empty("\"\""), + rdata_txt_like_quoted("\"Test-String\"") + { wiredata_longesttxt[0] = 255; // adjust length } - static const TXT_LIKE rdata_txt_like; - static const TXT_LIKE rdata_txt_like_empty; - static const TXT_LIKE rdata_txt_like_quoted; + vector wiredata_longesttxt; + const TXT_LIKE rdata_txt_like; + const TXT_LIKE rdata_txt_like_empty; + const TXT_LIKE rdata_txt_like_quoted; }; -template -const TXT_LIKE Rdata_TXT_LIKE_Test::rdata_txt_like("Test String"); - -template -const TXT_LIKE Rdata_TXT_LIKE_Test::rdata_txt_like_empty(""); - -template -const TXT_LIKE Rdata_TXT_LIKE_Test::rdata_txt_like_quoted - ("\"Test String\""); - // The list of types we want to test. typedef testing::Types Implementations; @@ -94,18 +90,19 @@ TYPED_TEST(Rdata_TXT_LIKE_Test, createFromText) { EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData, this->obuffer.getData(), this->obuffer.getLength(), - &wiredata_longesttxt[0], wiredata_longesttxt.size()); + &this->wiredata_longesttxt[0], + this->wiredata_longesttxt.size()); // Too long text for a valid character-string. EXPECT_THROW(TypeParam(string(256, 'a')), CharStringTooLong); // The escape character makes the double quote a part of character-string, // so this is invalid input and should be rejected. - EXPECT_THROW(TypeParam("\"Test String\\\""), InvalidRdataText); + EXPECT_THROW(TypeParam("\"Test-String\\\""), InvalidRdataText); // Terminating double-quote is provided, so this is valid, but in this // version of implementation we reject escaped characters. - EXPECT_THROW(TypeParam("\"Test String\\\"\""), InvalidRdataText); + EXPECT_THROW(TypeParam("\"Test-String\\\"\""), InvalidRdataText); } void @@ -129,13 +126,15 @@ makeLargest(vector& data) { TYPED_TEST(Rdata_TXT_LIKE_Test, createFromWire) { EXPECT_EQ(0, this->rdata_txt_like.compare( - *this->rdataFactoryFromFile(RRTYPE(), RRClass("IN"), - "rdata_txt_fromWire1"))); + *this->rdataFactoryFromFile(RRTYPE(), + RRClass("IN"), + "rdata_txt_fromWire1"))); // Empty character string EXPECT_EQ(0, this->rdata_txt_like_empty.compare( - *this->rdataFactoryFromFile(RRTYPE(), RRClass("IN"), - "rdata_txt_fromWire2.wire"))); + *this->rdataFactoryFromFile(RRTYPE(), + RRClass("IN"), + "rdata_txt_fromWire2.wire"))); // Multiple character strings this->obuffer.clear(); @@ -188,7 +187,7 @@ TYPED_TEST(Rdata_TXT_LIKE_Test, createFromWire) { TYPED_TEST(Rdata_TXT_LIKE_Test, createFromLexer) { EXPECT_EQ(0, this->rdata_txt_like.compare( *test::createRdataUsingLexer(RRTYPE(), RRClass::IN(), - "Test String"))); + "Test-String"))); } TYPED_TEST(Rdata_TXT_LIKE_Test, toWireBuffer) { @@ -208,7 +207,7 @@ TYPED_TEST(Rdata_TXT_LIKE_Test, toWireRenderer) { } TYPED_TEST(Rdata_TXT_LIKE_Test, toText) { - EXPECT_EQ("\"Test String\"", this->rdata_txt_like.toText()); + EXPECT_EQ("\"Test-String\"", this->rdata_txt_like.toText()); } TYPED_TEST(Rdata_TXT_LIKE_Test, assignment) { diff --git a/src/lib/dns/tests/testdata/rdata_txt_fromWire1 b/src/lib/dns/tests/testdata/rdata_txt_fromWire1 index 2c51efea24..95980dbfc9 100644 --- a/src/lib/dns/tests/testdata/rdata_txt_fromWire1 +++ b/src/lib/dns/tests/testdata/rdata_txt_fromWire1 @@ -1,9 +1,9 @@ # # various kinds of TXT RDATA stored in an input buffer # -# Valid RDATA for "Test String" +# Valid RDATA for "Test-String" # # RDLENGHT=12 bytes 00 0c -# T e s t S t r i n g - 0b 54 65 73 74 20 53 74 72 69 6e 67 +# T e s t - S t r i n g + 0b 54 65 73 74 2d 53 74 72 69 6e 67 diff --git a/src/lib/util/python/gen_wiredata.py.in b/src/lib/util/python/gen_wiredata.py.in index f997701540..55724c9f10 100755 --- a/src/lib/util/python/gen_wiredata.py.in +++ b/src/lib/util/python/gen_wiredata.py.in @@ -770,7 +770,7 @@ class TXT(RR): nstring = 1 stringlen = None - string = 'Test String' + string = 'Test-String' def dump(self, f): stringlen_list = []