[2371] tested the nested open operation. no need to change impl.

diff --git a/src/lib/dns/tests/master_lexer_unittest.cc b/src/lib/dns/tests/master_lexer_unittest.cc
index a3046af336b29051cf7bfa32fd9d95f37aad8f91..78fb17ab3dbaec908aabd0948e77aec7eece5a7d 100644 (file)
--- a/src/lib/dns/tests/master_lexer_unittest.cc
+++ b/src/lib/dns/tests/master_lexer_unittest.cc
@@ -32,10 +32,13 @@ namespace {
 
 class MasterLexerTest : public ::testing::Test {
 protected:
-    MasterLexerTest() {}
+    MasterLexerTest() :
+        expected_stream_name("stream-" + lexical_cast<string>(&ss))
+    {}
 
     MasterLexer lexer;
     stringstream ss;
+    const string expected_stream_name;
 };
 
 // Commonly used check case where the input sources stack is empty.
@@ -52,8 +55,7 @@ TEST_F(MasterLexerTest, preOpen) {
 
 TEST_F(MasterLexerTest, openStream) {
     lexer.open(ss);
-    EXPECT_EQ(string("stream-") + lexical_cast<string>(&ss),
-              lexer.getSourceName());
+    EXPECT_EQ(expected_stream_name, lexer.getSourceName());
 
     // From the point of view of this test, we only have to check (though
     // indirectly) getSourceLine calls InputSource::getCurrentLine.  It should
@@ -76,6 +78,22 @@ TEST_F(MasterLexerTest, openFile) {
     checkEmptySource(lexer);
 }
 
+TEST_F(MasterLexerTest, nestedOpen) {
+    lexer.open(ss);
+    EXPECT_EQ(expected_stream_name, lexer.getSourceName());
+
+    // We can open another source without closing the previous one.
+    lexer.open(TEST_DATA_SRCDIR "/masterload.txt");
+    EXPECT_EQ(TEST_DATA_SRCDIR "/masterload.txt", lexer.getSourceName());
+
+    // Close works on the "topmost" (opened last) source
+    lexer.close();
+    EXPECT_EQ(expected_stream_name, lexer.getSourceName());
+
+    lexer.close();
+    EXPECT_TRUE(lexer.getSourceName().empty());
+}
+
 TEST_F(MasterLexerTest, invalidClose) {
     // close() cannot be called if the sources stack is empty.
     EXPECT_THROW(lexer.close(), isc::InvalidOperation);