[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit dd488a8047e5ef1e0d1814ecb0b159bd3fdddcf8
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 27 22:29:05 2001 +0000

    Added more functions to qmap-test
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@215 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/tests/qt/qmap-test.chk b/WebCore/kwq/tests/qt/qmap-test.chk
index a8e9d11..fb99872 100644
--- a/WebCore/kwq/tests/qt/qmap-test.chk
+++ b/WebCore/kwq/tests/qt/qmap-test.chk
@@ -1,5 +1,9 @@
-QMap: [size: 5; items: (1,10), (2,20), (3,30), (4,40), (5,50)]
-item keyed to 'one': 10
-remove item keyed to 'three': QMap: [size: 4; items: (1,10), (2,20), (4,40), (5,50)]
-d0 is empty: 1
-d1 is empty: 0
+d1: QMap: [size: 5; items: (1,10), (2,20), (3,30), (4,40), (5,50)]
+d1 count: 5
+d1 find 1: 10
+d1 remove 3: QMap: [size: 4; items: (1,10), (2,20), (4,40), (5,50)]
+d0 isEmpty: 1
+d1 isEmpty: 0
+d2 = d1, d2: QMap: [size: 4; items: (1,10), (2,20), (4,40), (5,50)]
+d2[1]: 10
+d1 clear: QMap: [size: 0; items: ]
diff --git a/WebCore/kwq/tests/qt/qmap-test.cpp b/WebCore/kwq/tests/qt/qmap-test.cpp
index 24cd8f1..2127153 100644
--- a/WebCore/kwq/tests/qt/qmap-test.cpp
+++ b/WebCore/kwq/tests/qt/qmap-test.cpp
@@ -10,22 +10,31 @@ int main() {
 
     QMap<int,int> d0;
     QMap<int,int> d1;
-
+    QMap<int,int> d2;
+    
     d1.insert(1, 10);
     d1.insert(2, 20);
     d1.insert(3, 30);
     d1.insert(4, 40);
     d1.insert(5, 50);
 
-    cout << d1 << endl;
-
-    cout << "item keyed to 'one': " << *(d1.find(1)) << endl;
+    cout << "d1: " << d1 << endl;
+    cout << "d1 count: " << d1.count() << endl;
+    
+    cout << "d1 find 1: " << *(d1.find(1)) << endl;
 
     d1.remove(3);
-    cout << "remove item keyed to 'three': " << d1 << endl;
-
-    cout << "d0 is empty: " << d0.isEmpty() << endl;
-    cout << "d1 is empty: " << d1.isEmpty() << endl;
-
+    cout << "d1 remove 3: " << d1 << endl;
+
+    cout << "d0 isEmpty: " << d0.isEmpty() << endl;
+    cout << "d1 isEmpty: " << d1.isEmpty() << endl;
+
+    d2 = d1;
+    cout << "d2 = d1, d2: " << d2 << endl;
+    
+    cout << "d2[1]: " << d2[1] << endl;
+    
+    d1.clear();
+    cout << "d1 clear: " << d1 << endl;
     return 0;
 }
diff --git a/WebCore/src/kwq/tests/qt/qmap-test.chk b/WebCore/src/kwq/tests/qt/qmap-test.chk
index a8e9d11..fb99872 100644
--- a/WebCore/src/kwq/tests/qt/qmap-test.chk
+++ b/WebCore/src/kwq/tests/qt/qmap-test.chk
@@ -1,5 +1,9 @@
-QMap: [size: 5; items: (1,10), (2,20), (3,30), (4,40), (5,50)]
-item keyed to 'one': 10
-remove item keyed to 'three': QMap: [size: 4; items: (1,10), (2,20), (4,40), (5,50)]
-d0 is empty: 1
-d1 is empty: 0
+d1: QMap: [size: 5; items: (1,10), (2,20), (3,30), (4,40), (5,50)]
+d1 count: 5
+d1 find 1: 10
+d1 remove 3: QMap: [size: 4; items: (1,10), (2,20), (4,40), (5,50)]
+d0 isEmpty: 1
+d1 isEmpty: 0
+d2 = d1, d2: QMap: [size: 4; items: (1,10), (2,20), (4,40), (5,50)]
+d2[1]: 10
+d1 clear: QMap: [size: 0; items: ]
diff --git a/WebCore/src/kwq/tests/qt/qmap-test.cpp b/WebCore/src/kwq/tests/qt/qmap-test.cpp
index 24cd8f1..2127153 100644
--- a/WebCore/src/kwq/tests/qt/qmap-test.cpp
+++ b/WebCore/src/kwq/tests/qt/qmap-test.cpp
@@ -10,22 +10,31 @@ int main() {
 
     QMap<int,int> d0;
     QMap<int,int> d1;
-
+    QMap<int,int> d2;
+    
     d1.insert(1, 10);
     d1.insert(2, 20);
     d1.insert(3, 30);
     d1.insert(4, 40);
     d1.insert(5, 50);
 
-    cout << d1 << endl;
-
-    cout << "item keyed to 'one': " << *(d1.find(1)) << endl;
+    cout << "d1: " << d1 << endl;
+    cout << "d1 count: " << d1.count() << endl;
+    
+    cout << "d1 find 1: " << *(d1.find(1)) << endl;
 
     d1.remove(3);
-    cout << "remove item keyed to 'three': " << d1 << endl;
-
-    cout << "d0 is empty: " << d0.isEmpty() << endl;
-    cout << "d1 is empty: " << d1.isEmpty() << endl;
-
+    cout << "d1 remove 3: " << d1 << endl;
+
+    cout << "d0 isEmpty: " << d0.isEmpty() << endl;
+    cout << "d1 isEmpty: " << d1.isEmpty() << endl;
+
+    d2 = d1;
+    cout << "d2 = d1, d2: " << d2 << endl;
+    
+    cout << "d2[1]: " << d2[1] << endl;
+    
+    d1.clear();
+    cout << "d1 clear: " << d1 << endl;
     return 0;
 }

-- 
WebKit Debian packaging