Moved most functions from Selection to ObjectSet

(bzr r14954.1.7)

1 files changed, 83 insertions, 80 deletions

diff --git a/testfiles/src/object-set-test.cpp b/testfiles/src/object-set-test.cpp
index 124740495..5c564c0dc 100644
--- a/testfiles/src/object-set-test.cpp
+++ b/testfiles/src/object-set-test.cpp
@@ -24,8 +24,12 @@ public:
         G = new SPObject();
         H = new SPObject();
         X = new SPObject();
+        set = new ObjectSet();
+        set2 = new ObjectSet();
     }
     ~ObjectSetTest() {
+        delete set;
+        delete set2;
         delete X;
         delete H;
         delete G;
@@ -45,57 +49,57 @@ public:
     SPObject* G;
     SPObject* H;
     SPObject* X;
-    ObjectSet set;
-    ObjectSet set2;
+    ObjectSet* set;
+    ObjectSet* set2;
 };
 
 TEST_F(ObjectSetTest, Basics) {
-    EXPECT_EQ(0, set.size());
-    set.add(A);
-    EXPECT_EQ(1, set.size());
-    EXPECT_TRUE(set.contains(A));
-    set.add(B);
-    set.add(C);
-    EXPECT_EQ(3, set.size());
-    EXPECT_TRUE(set.contains(B));
-    EXPECT_TRUE(set.contains(C));
-    EXPECT_FALSE(set.contains(D));
-    EXPECT_FALSE(set.contains(X));
-    set.remove(A);
-    EXPECT_EQ(2, set.size());
-    EXPECT_FALSE(set.contains(A));
-    set.clear();
-    EXPECT_EQ(0, set.size());
+    EXPECT_EQ(0, set->size());
+    set->add(A);
+    EXPECT_EQ(1, set->size());
+    EXPECT_TRUE(set->includes(A));
+    set->add(B);
+    set->add(C);
+    EXPECT_EQ(3, set->size());
+    EXPECT_TRUE(set->includes(B));
+    EXPECT_TRUE(set->includes(C));
+    EXPECT_FALSE(set->includes(D));
+    EXPECT_FALSE(set->includes(X));
+    set->remove(A);
+    EXPECT_EQ(2, set->size());
+    EXPECT_FALSE(set->includes(A));
+    set->clear();
+    EXPECT_EQ(0, set->size());
 }
 
 TEST_F(ObjectSetTest, Autoremoving) {
     SPObject* Q = new SPObject();
     Q->invoke_build(_doc, _doc->rroot, 1);
-    set.add(Q);
-    EXPECT_TRUE(set.contains(Q));
-    EXPECT_EQ(1, set.size());
+    set->add(Q);
+    EXPECT_TRUE(set->includes(Q));
+    EXPECT_EQ(1, set->size());
     Q->releaseReferences();
-    EXPECT_EQ(0, set.size());
+    EXPECT_EQ(0, set->size());
 }
 
 TEST_F(ObjectSetTest, BasicDescendants) {
     A->attach(B, nullptr);
     B->attach(C, nullptr);
     A->attach(D, nullptr);
-    bool resultB = set.add(B);
-    bool resultB2 = set.add(B);
+    bool resultB = set->add(B);
+    bool resultB2 = set->add(B);
     EXPECT_TRUE(resultB);
     EXPECT_FALSE(resultB2);
-    EXPECT_TRUE(set.contains(B));
-    bool resultC = set.add(C);
+    EXPECT_TRUE(set->includes(B));
+    bool resultC = set->add(C);
     EXPECT_FALSE(resultC);
-    EXPECT_FALSE(set.contains(C));
-    EXPECT_EQ(1, set.size());
-    bool resultA = set.add(A);
+    EXPECT_FALSE(set->includes(C));
+    EXPECT_EQ(1, set->size());
+    bool resultA = set->add(A);
     EXPECT_TRUE(resultA);
-    EXPECT_EQ(1, set.size());
-    EXPECT_TRUE(set.contains(A));
-    EXPECT_FALSE(set.contains(B));
+    EXPECT_EQ(1, set->size());
+    EXPECT_TRUE(set->includes(A));
+    EXPECT_FALSE(set->includes(B));
 }
 
 TEST_F(ObjectSetTest, AdvancedDescendants) {
@@ -107,19 +111,19 @@ TEST_F(ObjectSetTest, AdvancedDescendants) {
     C->attach(F, nullptr);
     C->attach(G, nullptr);
     C->attach(H, nullptr);
-    set.add(A);
-    bool resultF = set.remove(F);
+    set->add(A);
+    bool resultF = set->remove(F);
     EXPECT_TRUE(resultF);
-    EXPECT_EQ(4, set.size());
-    EXPECT_FALSE(set.contains(F));
-    EXPECT_TRUE(set.contains(B));
-    EXPECT_TRUE(set.contains(G));
-    EXPECT_TRUE(set.contains(H));
-    EXPECT_TRUE(set.contains(X));
-    bool resultF2 = set.add(F);
+    EXPECT_EQ(4, set->size());
+    EXPECT_FALSE(set->includes(F));
+    EXPECT_TRUE(set->includes(B));
+    EXPECT_TRUE(set->includes(G));
+    EXPECT_TRUE(set->includes(H));
+    EXPECT_TRUE(set->includes(X));
+    bool resultF2 = set->add(F);
     EXPECT_TRUE(resultF2);
-    EXPECT_EQ(5, set.size());
-    EXPECT_TRUE(set.contains(F));
+    EXPECT_EQ(5, set->size());
+    EXPECT_TRUE(set->includes(F));
 }
 
 TEST_F(ObjectSetTest, Removing) {
@@ -131,27 +135,27 @@ TEST_F(ObjectSetTest, Removing) {
     C->attach(F, nullptr);
     C->attach(G, nullptr);
     C->attach(H, nullptr);
-    bool removeH = set.remove(H);
+    bool removeH = set->remove(H);
     EXPECT_FALSE(removeH);
-    set.add(A);
-    bool removeX = set.remove(X);
+    set->add(A);
+    bool removeX = set->remove(X);
     EXPECT_TRUE(removeX);
-    EXPECT_EQ(2, set.size());
-    EXPECT_TRUE(set.contains(B));
-    EXPECT_TRUE(set.contains(C));
-    EXPECT_FALSE(set.contains(X));
-    EXPECT_FALSE(set.contains(A));
-    bool removeX2 = set.remove(X);
+    EXPECT_EQ(2, set->size());
+    EXPECT_TRUE(set->includes(B));
+    EXPECT_TRUE(set->includes(C));
+    EXPECT_FALSE(set->includes(X));
+    EXPECT_FALSE(set->includes(A));
+    bool removeX2 = set->remove(X);
     EXPECT_FALSE(removeX2);
-    EXPECT_EQ(2, set.size());
-    bool removeA = set.remove(A);
+    EXPECT_EQ(2, set->size());
+    bool removeA = set->remove(A);
     EXPECT_FALSE(removeA);
-    EXPECT_EQ(2, set.size());
-    bool removeC = set.remove(C);
+    EXPECT_EQ(2, set->size());
+    bool removeC = set->remove(C);
     EXPECT_TRUE(removeC);
-    EXPECT_EQ(1, set.size());
-    EXPECT_TRUE(set.contains(B));
-    EXPECT_FALSE(set.contains(C));
+    EXPECT_EQ(1, set->size());
+    EXPECT_TRUE(set->includes(B));
+    EXPECT_FALSE(set->includes(C));
 }
 
 TEST_F(ObjectSetTest, TwoSets) {
@@ -159,19 +163,19 @@ TEST_F(ObjectSetTest, TwoSets) {
     Q->invoke_build(_doc, _doc->rroot, 1);
     A->attach(B, nullptr);
     A->attach(Q, nullptr);
-    set.add(A);
-    set2.add(A);
-    EXPECT_EQ(1, set.size());
-    EXPECT_EQ(1, set2.size());
-    set.remove(B);
-    EXPECT_EQ(1, set.size());
-    EXPECT_TRUE(set.contains(Q));
-    EXPECT_EQ(1, set2.size());
-    EXPECT_TRUE(set2.contains(A));
+    set->add(A);
+    set2->add(A);
+    EXPECT_EQ(1, set->size());
+    EXPECT_EQ(1, set2->size());
+    set->remove(B);
+    EXPECT_EQ(1, set->size());
+    EXPECT_TRUE(set->includes(Q));
+    EXPECT_EQ(1, set2->size());
+    EXPECT_TRUE(set2->includes(A));
     Q->releaseReferences();
-    EXPECT_EQ(0, set.size());
-    EXPECT_EQ(1, set2.size());
-    EXPECT_TRUE(set2.contains(A));
+    EXPECT_EQ(0, set->size());
+    EXPECT_EQ(1, set2->size());
+    EXPECT_TRUE(set2->includes(A));
 }
 
 TEST_F(ObjectSetTest, SetRemoving) {
@@ -186,18 +190,17 @@ TEST_F(ObjectSetTest, SetRemoving) {
 }
 
 TEST_F(ObjectSetTest, SetOrder) {
-    set.add(A);
-    set.add(D);
-    set.add(B);
-    set.add(E);
-    set.add(C);
-    EXPECT_EQ(5, set.size());
-    auto it = set.begin();
+    set->add(A);
+    set->add(D);
+    set->add(B);
+    set->add(E);
+    set->add(C);
+    EXPECT_EQ(5, set->size());
+    auto it = set->begin();
     EXPECT_EQ(A, *it++);
     EXPECT_EQ(D, *it++);
     EXPECT_EQ(B, *it++);
     EXPECT_EQ(E, *it++);
     EXPECT_EQ(C, *it++);
-    EXPECT_EQ(set.end(), it);
-
+    EXPECT_EQ(set->end(), it);
 }
\ No newline at end of file