[1062] Merge branch 'trac1062' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac1062

src/lib/util/tests/filename_unittest.cc

@@ -143,13 +143,13 @@ TEST_F(FilenameTest, Components) {
     EXPECT_EQ("/", fname.directory());
     EXPECT_EQ(" ", fname.name());
     EXPECT_EQ(".", fname.extension());
-    EXPECT_EQ(".", fname.nameAndExtension());
+    EXPECT_EQ(" .", fname.nameAndExtension());
 
     fname.setName(" / . ");
     EXPECT_EQ("/", fname.directory());
     EXPECT_EQ(" ", fname.name());
     EXPECT_EQ(".", fname.extension());
-    EXPECT_EQ(".", fname.nameAndExtension());
+    EXPECT_EQ(" .", fname.nameAndExtension());
 }
 
 // Check that the expansion with a default works.