Changeset 105666 in webkit

Timestamp:

Jan 23, 2012 5:21:51 PM (12 years ago)

Author:

barraclough@apple.com

Message:

Unreviewed build fix - r105646 broke this.

• TestWebKitAPI/Tests/WTF/RedBlackTree.cpp:

(TestWebKitAPI::TestNode::TestNode):
(TestWebKitAPI::TestNode::key):
(TestWebKitAPI::RedBlackTreeTest::assertEqual):
(TestWebKitAPI::RedBlackTreeTest::assertSameValuesForKey):
(TestWebKitAPI::RedBlackTreeTest::testDriver):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WTF/RedBlackTree.cpp (modified) (7 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-01-23  Gavin Barraclough  <barraclough@apple.com>
+
+        Unreviewed build fix - r105646 broke this.
+
+        * TestWebKitAPI/Tests/WTF/RedBlackTree.cpp:
+        (TestWebKitAPI::TestNode::TestNode):
+        (TestWebKitAPI::TestNode::key):
+        (TestWebKitAPI::RedBlackTreeTest::assertEqual):
+        (TestWebKitAPI::RedBlackTreeTest::assertSameValuesForKey):
+        (TestWebKitAPI::RedBlackTreeTest::testDriver):
+
 2012-01-23  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/RedBlackTree.cpp

@@ -35 +35 @@
 namespace TestWebKitAPI {
 
-class RedBlackTreeTest: public testing::Test {
+class TestNode : public RedBlackTree<TestNode, char>::Node {
+public:
+    TestNode(char key, unsigned value)
+        : m_key(key)
+        , m_value(value)
+    {
+    }
+
+    char key()
+    {
+        return m_key
+    }
+
+    char m_key;
+    unsigned m_value;
+};
+
+class RedBlackTreeTest : public testing::Test {
 public:
     unsigned m_counter;
@@ -136 +153 @@
     
     // This deliberately passes a copy of the vector.
-    void assertEqual(RedBlackTree<char, unsigned>& asTree, PairVector asVector)
-    {
-        for (RedBlackTree<char, unsigned>::Node* current = asTree.first(); current; current = current->successor())
+    void assertEqual(RedBlackTree<TestNode, char>& asTree, PairVector asVector)
+    {
+        for (TestNode* current = asTree.first(); current; current = current->successor())
             assertFoundAndRemove(asVector, current->m_key, current->m_value);
     }
     
-    void assertSameValuesForKey(RedBlackTree<char, unsigned>& asTree, RedBlackTree<char, unsigned>::Node* node, PairVector foundValues, char key)
+    void assertSameValuesForKey(RedBlackTree<TestNode, char>& asTree, TestNode* node, PairVector foundValues, char key)
     {
         if (node) {
             EXPECT_EQ(node->m_key, key);
             
-            RedBlackTree<char, unsigned>::Node* prevNode = node;
+            TestNode* prevNode = node;
             do {
                 node = prevNode;
@@ -177 +194 @@
     {
         PairVector asVector;
-        RedBlackTree<char, unsigned> asTree;
+        RedBlackTree<TestNode, char> asTree;
         
         for (const char* current = controlString; *current; current += 2) {
@@ -189 +206 @@
             switch (command) {
             case '+': {
-                RedBlackTree<char, unsigned>::Node* node = new RedBlackTree<char, unsigned>::Node(key, value);
+                TestNode* node = new TestNode(key, value);
                 asTree.insert(node);
                 asVector.append(Pair(key, value));
@@ -196 +213 @@
                 
             case '*': {
-                RedBlackTree<char, unsigned>::Node* node = asTree.findExact(key);
+                TestNode* node = asTree.findExact(key);
                 if (node)
                     EXPECT_EQ(node->m_key, key);
@@ -204 +221 @@
 
             case '@': {
-                RedBlackTree<char, unsigned>::Node* node = asTree.findLeastGreaterThanOrEqual(key);
+                TestNode* node = asTree.findLeastGreaterThanOrEqual(key);
                 if (node) {
                     EXPECT_TRUE(node->m_key >= key);
@@ -215 +232 @@
             case '!': {
                 while (true) {
-                    RedBlackTree<char, unsigned>::Node* node = asTree.remove(key);
+                    TestNode* node = asTree.remove(key);
                     if (node) {
                         EXPECT_EQ(node->m_key, key);