From 01e652cc75df737cf8919a84e016afe1dff4aa3e Mon Sep 17 00:00:00 2001
From: Brian Munkholm <bm@tightdb.com>
Date: Thu, 21 Feb 2013 16:20:06 +0100
Subject: [PATCH] BREAKING change: Renamed Group::get_table_count() to size().
 (and added missing testcase)

---
 changelog.txt                           |  3 +++
 doc/ref_cpp/data/group_ref.yaml         |  5 +++--
 doc/ref_cpp/examples/group_traverse.cpp |  2 +-
 src/tightdb/group.cpp                   |  6 +++---
 src/tightdb/group.hpp                   |  4 ++--
 test/testgroup.cpp                      | 16 ++++++++++++++++
 6 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index d19aae7e0d6..f7e6c8359a5 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -13,6 +13,9 @@ Format:
 ==================
 
 
+2013-02-21 (Brian Munkholm
+-+ Renamed Group::get_table_count() to Group::size()
+
 2013-02-19 (Kristian Spangsege)
 + Type of Group::BufferSpec::m_data changed from <char*> to <const char*>.
 
diff --git a/doc/ref_cpp/data/group_ref.yaml b/doc/ref_cpp/data/group_ref.yaml
index f27e85e3db1..9173d485d21 100644
--- a/doc/ref_cpp/data/group_ref.yaml
+++ b/doc/ref_cpp/data/group_ref.yaml
@@ -123,10 +123,11 @@ CATEGORIES:
       EXAMPLES:
       - DESCR  :
         CODE   : ex_cpp_group_operator_equal
+
 - Table:
   METHODS:
-  - g_group_table_count:
-      NAMES    : get_table_count
+  - g_group_size:
+      NAMES    : size
       DESCR    : >
                  A group can be a container for many tables, and this method counts
                  the number of tables currently stored in the group.
diff --git a/doc/ref_cpp/examples/group_traverse.cpp b/doc/ref_cpp/examples/group_traverse.cpp
index 746b6e025a6..446fb3284e6 100644
--- a/doc/ref_cpp/examples/group_traverse.cpp
+++ b/doc/ref_cpp/examples/group_traverse.cpp
@@ -13,7 +13,7 @@ TIGHTDB_TABLE_2(PeopleTable,
 void traverse(const Group& group)
 {
 // @@EndFold@@
-    for (size_t i=0; i<group.get_table_count(); ++i) {
+    for (size_t i=0; i<group.size(); ++i) {
         const char* table_name = group.get_table_name(i);
         ConstTableRef table = group.get_table(table_name);
         cout << table_name << " " << table->get_column_count() << "\n";
diff --git a/src/tightdb/group.cpp b/src/tightdb/group.cpp
index ac11701b8e2..58be8518283 100644
--- a/src/tightdb/group.cpp
+++ b/src/tightdb/group.cpp
@@ -507,8 +507,8 @@ void Group::update_from_shared(size_t top_ref, size_t len)
 
 bool Group::operator==(const Group& g) const
 {
-    const size_t n = get_table_count();
-    if (n != g.get_table_count()) return false;
+    const size_t n = size();
+    if (n != g.size()) return false;
     for (size_t i=0; i<n; ++i) {
         const Table* t1 = get_table_ptr(i);
         const Table* t2 = g.get_table_ptr(i);
@@ -519,7 +519,7 @@ bool Group::operator==(const Group& g) const
 
 void Group::to_string(std::ostream& out) const
 {
-    const size_t count = get_table_count();
+    const size_t count = size();
 
     // Calculate widths
     size_t name_width = 6;
diff --git a/src/tightdb/group.hpp b/src/tightdb/group.hpp
index 922acc87a4b..66ddc908240 100644
--- a/src/tightdb/group.hpp
+++ b/src/tightdb/group.hpp
@@ -138,7 +138,7 @@ class Group: private Table::Parent {
 
     bool is_empty() const TIGHTDB_NOEXCEPT;
 
-    size_t get_table_count() const;
+    size_t size() const;
     const char* get_table_name(size_t table_ndx) const;
     bool has_table(const char* name) const;
 
@@ -368,7 +368,7 @@ inline bool Group::in_initial_state() const
     return !m_top.IsValid();
 }
 
-inline std::size_t Group::get_table_count() const
+inline std::size_t Group::size() const
 {
     if (!m_top.IsValid()) return 0;
     return m_tableNames.size();
diff --git a/test/testgroup.cpp b/test/testgroup.cpp
index 5ac9135397f..b47e613b982 100644
--- a/test/testgroup.cpp
+++ b/test/testgroup.cpp
@@ -20,6 +20,22 @@ TIGHTDB_TABLE_4(TestTableGroup,
 
 } // Anonymous namespace
 
+TEST(Group_Size)
+{
+    Group g;
+
+    CHECK_EQUAL(true, g.is_empty());
+
+    TableRef t = g.get_table("a");
+    CHECK_EQUAL(false, g.is_empty());
+    CHECK_EQUAL(1, g.size());
+
+    TableRef t1 = g.get_table("b");
+    CHECK_EQUAL(false, g.is_empty());
+    CHECK_EQUAL(2, g.size());
+
+}
+
 TEST(Group_GetTable)
 {
     Group g;