BIND 10 trac997, updated. 04890d21897fd9afb6e13a0f7dea1f2b811d6cd6 [trac978] Return few camels

[BIND 10 source code commits]

The branch, trac997 has been updated
       via  04890d21897fd9afb6e13a0f7dea1f2b811d6cd6 (commit)
      from  92506a5cbf25744a70fb061ebe476160b3664e28 (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 04890d21897fd9afb6e13a0f7dea1f2b811d6cd6
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Jun 14 20:30:33 2011 +0200

    [trac978] Return few camels

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

Summary of changes:
 src/lib/acl/acl.h             |    2 +-
 src/lib/acl/tests/acl_test.cc |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/acl/acl.h b/src/lib/acl/acl.h
index 9ab5f7e..56aac09 100644
--- a/src/lib/acl/acl.h
+++ b/src/lib/acl/acl.h
@@ -127,7 +127,7 @@ protected:
      *
      * This is for testing purposes only.
      */
-    const Action& get_default_action() const {
+    const Action& getDefaultAction() const {
         return (default_action_);
     }
 };
diff --git a/src/lib/acl/tests/acl_test.cc b/src/lib/acl/tests/acl_test.cc
index 67dfcf0..626d055 100644
--- a/src/lib/acl/tests/acl_test.cc
+++ b/src/lib/acl/tests/acl_test.cc
@@ -88,8 +88,8 @@ public:
         ACL(DROP)
     {}
     // Check the stored default action there
-    void check_default_action(BasicAction ac) {
-        EXPECT_EQ(get_default_action(), ac);
+    void checkDefaultAction(BasicAction ac) {
+        EXPECT_EQ(getDefaultAction(), ac);
     }
 };
 
@@ -115,8 +115,8 @@ public:
  *
  * We use the default ACL unchanged from the test class.
  */
-TEST_F(ACLTest, empty_rule) {
-    acl_.check_default_action(DROP);
+TEST_F(ACLTest, emptyRule) {
+    acl_.checkDefaultAction(DROP);
     EXPECT_EQ(DROP, acl_.execute(log_));
     // No test was run
     log_.checkFirst(0);
@@ -125,7 +125,7 @@ TEST_F(ACLTest, empty_rule) {
 /*
  * This tests the default action in case no check matches.
  */
-TEST_F(ACLTest, no_match) {
+TEST_F(ACLTest, noMatch) {
     acl_.append(get_check(false), ACCEPT);
     acl_.append(get_check(false), REJECT);
     EXPECT_EQ(DROP, acl_.execute(log_));
@@ -137,7 +137,7 @@ TEST_F(ACLTest, no_match) {
  * Checks that it takes the first matching check and returns the
  * value. Also checks that the others aren't run at all.
  */
-TEST_F(ACLTest, check) {
+TEST_F(ACLTest, firstMatch) {
     acl_.append(get_check(false), ACCEPT);
     acl_.append(get_check(true), REJECT);
     acl_.append(get_check(true), ACCEPT);