BIND 10 trac551, updated. 967fe3d95663240940e2c5e653fc3ecac7739037 [trac551] Small fix of tests

[BIND 10 source code commits]

The branch, trac551 has been updated
       via  967fe3d95663240940e2c5e653fc3ecac7739037 (commit)
      from  310d15bf23ac533d70a20c0a881fc285cb7af3f7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 967fe3d95663240940e2c5e653fc3ecac7739037
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Feb 17 11:45:35 2011 +0100

    [trac551] Small fix of tests

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/tests/memory_datasrc_unittest.cc |   28 ++++++++++-----------
 1 files changed, 13 insertions(+), 15 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/memory_datasrc_unittest.cc b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
index 9bb672e..be70453 100644
--- a/src/lib/datasrc/tests/memory_datasrc_unittest.cc
+++ b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
@@ -821,9 +821,9 @@ TEST_F(MemoryZoneTest, emptyWildcard) {
     }
 
     {
-        SCOPED_TRACE("Asking outside the wildcard");
+        SCOPED_TRACE("Asking on the non-terminal");
         findTest(Name("wild.bar.foo.example.org"), RRType::A(),
-            Zone::NXDOMAIN);
+            Zone::NXRRSET);
     }
 }
 
@@ -838,21 +838,19 @@ TEST_F(MemoryZoneTest, nestedEmptyWildcard) {
     }
 
     {
-        SCOPED_TRACE("Matching against lower wildcard");
-        findTest(Name("baz.foo.*.bar.example.org"), RRType::A(),
-            Zone::NXRRSET);
-    }
+        SCOPED_TRACE("Matching wildcard against empty nonterminal");
 
-    {
-        SCOPED_TRACE("Trying to match over both wildcards at once");
-        findTest(Name("baz.foo.baz.bar.example.org"), RRType::A(),
-            Zone::NXDOMAIN);
-    }
+        const char* names[] = {
+            "baz.foo.*.bar.example.org",
+            "baz.foo.baz.bar.example.org",
+            "*.foo.baz.bar.example.org",
+            NULL
+        };
 
-    {
-        SCOPED_TRACE("Trying to match over upper wildcard");
-        findTest(Name("*.foo.baz.bar.example.org"), RRType::A(),
-            Zone::NXDOMAIN);
+        for (const char** name(names); *name != NULL; ++ name) {
+            SCOPED_TRACE(string("Node ") + *name);
+            findTest(Name(*name), RRType::A(), Zone::NXRRSET);
+        }
     }
 
     // Domains to test