BIND 10 trac510, updated. 2142e8e6f760c577b58747c515c38fcc10168e04 [trac510] Modify testcase incrementCounterItem as suggested on ticket #510.

[BIND 10 source code commits]

The branch, trac510 has been updated
       via  2142e8e6f760c577b58747c515c38fcc10168e04 (commit)
       via  402c03afffde1e664c9dbd7b3c40e78a23b261c5 (commit)
      from  657349ae281dcdf737b187d0be2cd7d0e4fa92a7 (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 2142e8e6f760c577b58747c515c38fcc10168e04
Author: Yoshitaka Aharen <aharen at jprs.co.jp>
Date:   Mon Dec 5 20:08:30 2011 +0900

    [trac510] Modify testcase incrementCounterItem as suggested on
    ticket #510.

commit 402c03afffde1e664c9dbd7b3c40e78a23b261c5
Author: Yoshitaka Aharen <aharen at jprs.co.jp>
Date:   Mon Dec 5 20:06:54 2011 +0900

    [trac510] style fix; do not set specific values for enums

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

Summary of changes:
 src/bin/auth/statistics.h                    |   12 ++++++------
 src/lib/statistics/tests/counter_unittest.cc |   11 +++++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/statistics.h b/src/bin/auth/statistics.h
index 200bf9f..3764ac9 100644
--- a/src/bin/auth/statistics.h
+++ b/src/bin/auth/statistics.h
@@ -56,14 +56,14 @@ private:
 public:
     // Enum for the type of counter
     enum ServerCounterType {
-        SERVER_UDP_QUERY = 0,  ///< SERVER_UDP_QUERY: counter for UDP queries
-        SERVER_TCP_QUERY = 1,  ///< SERVER_TCP_QUERY: counter for TCP queries
-        SERVER_COUNTER_TYPES = 2 ///< The number of defined counters
+        SERVER_UDP_QUERY,       ///< SERVER_UDP_QUERY: counter for UDP queries
+        SERVER_TCP_QUERY,       ///< SERVER_TCP_QUERY: counter for TCP queries
+        SERVER_COUNTER_TYPES    ///< The number of defined counters
     };
     enum PerZoneCounterType {
-        ZONE_UDP_QUERY = 0,  ///< ZONE_UDP_QUERY: counter for UDP queries
-        ZONE_TCP_QUERY = 1,  ///< ZONE_TCP_QUERY: counter for TCP queries
-        PER_ZONE_COUNTER_TYPES = 2 ///< The number of defined counters
+        ZONE_UDP_QUERY,         ///< ZONE_UDP_QUERY: counter for UDP queries
+        ZONE_TCP_QUERY,         ///< ZONE_TCP_QUERY: counter for TCP queries
+        PER_ZONE_COUNTER_TYPES  ///< The number of defined counters
     };
     /// The constructor.
     ///
diff --git a/src/lib/statistics/tests/counter_unittest.cc b/src/lib/statistics/tests/counter_unittest.cc
index 8293376..f97fbff 100644
--- a/src/lib/statistics/tests/counter_unittest.cc
+++ b/src/lib/statistics/tests/counter_unittest.cc
@@ -58,6 +58,17 @@ TEST_F(CounterTest, incrementCounterItem) {
     EXPECT_EQ(counter.get(ITEM1), 1);
     EXPECT_EQ(counter.get(ITEM2), 2);
     EXPECT_EQ(counter.get(ITEM3), 3);
+    // Increment counters once more
+    counter.inc(ITEM1);
+    counter.inc(ITEM2);
+    counter.inc(ITEM2);
+    counter.inc(ITEM3);
+    counter.inc(ITEM3);
+    counter.inc(ITEM3);
+    // Check if the counters have expected values
+    EXPECT_EQ(counter.get(ITEM1), 2);
+    EXPECT_EQ(counter.get(ITEM2), 4);
+    EXPECT_EQ(counter.get(ITEM3), 6);
 }
 
 TEST_F(CounterTest, invalidCounterSize) {