From: JINMEI Tatuya Date: Fri, 2 Nov 2012 21:29:10 +0000 (-0700) Subject: [2371] adjusted test name/comment to match the method name change of open/close X-Git-Tag: trac2487_base~1^2~21^2~30^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f15deef54e5c162260abfa2e9deae226f85c4220;p=thirdparty%2Fkea.git [2371] adjusted test name/comment to match the method name change of open/close --- diff --git a/src/lib/dns/tests/master_lexer_unittest.cc b/src/lib/dns/tests/master_lexer_unittest.cc index b538d16dd3..40265048c3 100644 --- a/src/lib/dns/tests/master_lexer_unittest.cc +++ b/src/lib/dns/tests/master_lexer_unittest.cc @@ -53,7 +53,7 @@ TEST_F(MasterLexerTest, preOpen) { checkEmptySource(lexer); } -TEST_F(MasterLexerTest, openStream) { +TEST_F(MasterLexerTest, pushStream) { lexer.pushSource(ss); EXPECT_EQ(expected_stream_name, lexer.getSourceName()); @@ -67,7 +67,7 @@ TEST_F(MasterLexerTest, openStream) { checkEmptySource(lexer); } -TEST_F(MasterLexerTest, openFile) { +TEST_F(MasterLexerTest, pushFile) { // We use zone file (-like) data, but in this test that actually doesn't // matter. lexer.pushSource(TEST_DATA_SRCDIR "/masterload.txt"); @@ -78,19 +78,19 @@ TEST_F(MasterLexerTest, openFile) { checkEmptySource(lexer); } -TEST_F(MasterLexerTest, openBadFileName) { +TEST_F(MasterLexerTest, pushBadFileName) { EXPECT_THROW(lexer.pushSource(NULL), isc::InvalidParameter); } -TEST_F(MasterLexerTest, nestedOpen) { +TEST_F(MasterLexerTest, nestedPush) { lexer.pushSource(ss); EXPECT_EQ(expected_stream_name, lexer.getSourceName()); - // We can open another source without closing the previous one. + // We can push another source without popping the previous one. lexer.pushSource(TEST_DATA_SRCDIR "/masterload.txt"); EXPECT_EQ(TEST_DATA_SRCDIR "/masterload.txt", lexer.getSourceName()); - // Close works on the "topmost" (last-opened) source + // Close works on the "topmost" (last-pushed) source lexer.popSource(); EXPECT_EQ(expected_stream_name, lexer.getSourceName());