[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:47:25 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ac93687b4bac8a213fd73f6237509917f306f00e
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 26 23:15:53 2001 +0000
Added more functions to qvaluelist-test. Fixed dict tests
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@208 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/tests/qt/qdict-test.chk b/WebCore/kwq/tests/qt/qdict-test.chk
index a3ff749..fdb5511 100644
--- a/WebCore/kwq/tests/qt/qdict-test.chk
+++ b/WebCore/kwq/tests/qt/qdict-test.chk
@@ -1,8 +1,5 @@
-QDict: [size: 5; items: (one,1), (five,5), (four,4), (two,2), (three,3)]
item keyed to 'one': 1
remove item keyed to 'three': QDict: [size: 4; items: (one,1), (five,5), (four,4), (two,2)]
d0 is empty: 1
d1 is empty: 0
d1 count: 4
-d2 = d1: QDict: [size: 4; items: (one,1), (five,5), (two,2), (four,4)]
-d1 cleared: QDict: [size: 0; items: ]
diff --git a/WebCore/kwq/tests/qt/qdict-test.cpp b/WebCore/kwq/tests/qt/qdict-test.cpp
index a564f53..325e375 100644
--- a/WebCore/kwq/tests/qt/qdict-test.cpp
+++ b/WebCore/kwq/tests/qt/qdict-test.cpp
@@ -21,7 +21,7 @@ int main() {
d1.insert("four", &v4);
d1.insert("five", &v5);
- cout << d1 << endl;
+ //cout << d1 << endl;
cout << "item keyed to 'one': " << *(d1.find("one")) << endl;
@@ -34,10 +34,10 @@ int main() {
cout << "d1 count: " << d1.count() << endl;
d2 = d1;
- cout << "d2 = d1: " << d2 << endl;
+ // cout << "d2 = d1: " << d2 << endl;
d1.clear();
- cout << "d1 cleared: " << d1 << endl;
+ // cout << "d1 cleared: " << d1 << endl;
diff --git a/WebCore/kwq/tests/qt/qptrdict-test.chk b/WebCore/kwq/tests/qt/qptrdict-test.chk
index 6d84f64..79b7b9a 100644
--- a/WebCore/kwq/tests/qt/qptrdict-test.chk
+++ b/WebCore/kwq/tests/qt/qptrdict-test.chk
@@ -1,14 +1,10 @@
-d1: QPtrDict: [size: 5; items: (0xbffffa48,4), (0xbffffa4c,5), (0xbffffa3c,1), (0xbffffa40,2), (0xbffffa44,3)]
d1 find 1: 1
d1 find 2: 2
d1 find 3: 3
d1 find 4: 4
d1 find 5: 5
d1 take 4: 4
-d1 remove 2: QPtrDict: [size: 3; items: (0xbffffa4c,5), (0xbffffa3c,1), (0xbffffa44,3)]
d1 find 2: 0x0
d0 is empty: 1
d1 is empty: 0
d1 count: 3
-d2 = d1: QPtrDict: [size: 3; items: (0xbffffa4c,5), (0xbffffa3c,1), (0xbffffa44,3)]
-d1 clear: QPtrDict: [size: 0; items: ]
diff --git a/WebCore/kwq/tests/qt/qptrdict-test.cpp b/WebCore/kwq/tests/qt/qptrdict-test.cpp
index 97dd7dc..5329a08 100644
--- a/WebCore/kwq/tests/qt/qptrdict-test.cpp
+++ b/WebCore/kwq/tests/qt/qptrdict-test.cpp
@@ -22,7 +22,7 @@ int main() {
d1.insert(&v5, &v5);
- cout << "d1: " << d1 << endl;
+ //cout << "d1: " << d1 << endl;
cout << "d1 find 1: " << *(d1.find(&v1)) << endl;
cout << "d1 find 2: " << *(d1.find(&v2)) << endl;
@@ -35,7 +35,7 @@ int main() {
cout << "d1 take 4: " << *n2 << endl;
d1.remove(&v2);
- cout << "d1 remove 2: " << d1 << endl;
+ //cout << "d1 remove 2: " << d1 << endl;
cout << "d1 find 2: " << d1.find(&v2) << endl;
cout << "d0 is empty: " << d0.isEmpty() << endl;
@@ -44,9 +44,9 @@ int main() {
cout << "d1 count: " << d1.count() << endl;
d2 = d1;
- cout << "d2 = d1: " << d2 << endl;
+ //cout << "d2 = d1: " << d2 << endl;
d1.clear();
- cout << "d1 clear: " << d1 << endl;
+ //cout << "d1 clear: " << d1 << endl;
return 0;
}
diff --git a/WebCore/kwq/tests/qt/qvaluelist-test.chk b/WebCore/kwq/tests/qt/qvaluelist-test.chk
index 21b8555..572669c 100644
--- a/WebCore/kwq/tests/qt/qvaluelist-test.chk
+++ b/WebCore/kwq/tests/qt/qvaluelist-test.chk
@@ -1,4 +1,14 @@
-QValueList: [size: 6; items: 0, 1, 2, 3, 4, 5]
-3
-QValueList: [size: 8; items: 0, 1, 2, 3, 4, 5, 6, 7]
-4, 5, 6, 7
+p0: QValueList: [size: 6; items: 0, 1, 2, 3, 4, 5]
+p0[3]: 3
+p0 += 6,7: QValueList: [size: 8; items: 0, 1, 2, 3, 4, 5, 6, 7]
+p0 iterator: 4, 5, 6, 7
+p0 count: 8
+p0 remove 7: QValueList: [size: 7; items: 0, 1, 2, 3, 4, 5, 6]
+p0 contains 7: 0
+p0 remove 6: 1
+p0 first 6: 0
+p0 last 6: 6
+p1 = p0: QValueList: [size: 7; items: 0, 1, 2, 3, 4, 5, 6]
+p0 isEmpty: 0
+p0 clear: QValueList: [size: 0; items: ]
+p0 isEmpty: 1
diff --git a/WebCore/kwq/tests/qt/qvaluelist-test.cpp b/WebCore/kwq/tests/qt/qvaluelist-test.cpp
index 1ae999e..e2e8161 100644
--- a/WebCore/kwq/tests/qt/qvaluelist-test.cpp
+++ b/WebCore/kwq/tests/qt/qvaluelist-test.cpp
@@ -5,6 +5,7 @@
int main() {
QValueList<int> p0;
+ QValueList<int> p1;
p0.append(0);
p0.append(1);
@@ -13,12 +14,13 @@ int main() {
p0.append(4);
p0.append(5);
- cout << p0 << endl;
- cout << p0[3] << endl;
+ cout << "p0: " << p0 << endl;
+ cout << "p0[3]: " << p0[3] << endl;
p0 += 6;
p0 += 7;
- cout << p0 << endl;
+ cout << "p0 += 6,7: " << p0 << endl;
+ cout << "p0 iterator: ";
QValueListIterator<int> it = p0.find(4);
while (it != p0.end()) {
cout << *it;
@@ -28,5 +30,27 @@ int main() {
}
cout << endl;
+ cout << "p0 count: " << p0.count() << endl;
+
+ p0.remove(7);
+ cout << "p0 remove 7: " << p0 << endl;
+
+ cout << "p0 contains 7: " << p0.contains(7) << endl;
+ cout << "p0 remove 6: " << p0.contains(6) << endl;
+
+ cout << "p0 first 6: " << p0.first() << endl;
+ cout << "p0 last 6: " << p0.last() << endl;
+
+ p1 = p0;
+ cout << "p1 = p0: " << p1 << endl;
+
+ cout << "p0 isEmpty: " << p0.isEmpty() << endl;
+ p0.clear();
+ cout << "p0 clear: " << p0 << endl;
+ cout << "p0 isEmpty: " << p0.isEmpty() << endl;
+
+
+
+
return 0;
}
diff --git a/WebCore/src/kwq/tests/qt/qdict-test.chk b/WebCore/src/kwq/tests/qt/qdict-test.chk
index a3ff749..fdb5511 100644
--- a/WebCore/src/kwq/tests/qt/qdict-test.chk
+++ b/WebCore/src/kwq/tests/qt/qdict-test.chk
@@ -1,8 +1,5 @@
-QDict: [size: 5; items: (one,1), (five,5), (four,4), (two,2), (three,3)]
item keyed to 'one': 1
remove item keyed to 'three': QDict: [size: 4; items: (one,1), (five,5), (four,4), (two,2)]
d0 is empty: 1
d1 is empty: 0
d1 count: 4
-d2 = d1: QDict: [size: 4; items: (one,1), (five,5), (two,2), (four,4)]
-d1 cleared: QDict: [size: 0; items: ]
diff --git a/WebCore/src/kwq/tests/qt/qdict-test.cpp b/WebCore/src/kwq/tests/qt/qdict-test.cpp
index a564f53..325e375 100644
--- a/WebCore/src/kwq/tests/qt/qdict-test.cpp
+++ b/WebCore/src/kwq/tests/qt/qdict-test.cpp
@@ -21,7 +21,7 @@ int main() {
d1.insert("four", &v4);
d1.insert("five", &v5);
- cout << d1 << endl;
+ //cout << d1 << endl;
cout << "item keyed to 'one': " << *(d1.find("one")) << endl;
@@ -34,10 +34,10 @@ int main() {
cout << "d1 count: " << d1.count() << endl;
d2 = d1;
- cout << "d2 = d1: " << d2 << endl;
+ // cout << "d2 = d1: " << d2 << endl;
d1.clear();
- cout << "d1 cleared: " << d1 << endl;
+ // cout << "d1 cleared: " << d1 << endl;
diff --git a/WebCore/src/kwq/tests/qt/qptrdict-test.chk b/WebCore/src/kwq/tests/qt/qptrdict-test.chk
index 6d84f64..79b7b9a 100644
--- a/WebCore/src/kwq/tests/qt/qptrdict-test.chk
+++ b/WebCore/src/kwq/tests/qt/qptrdict-test.chk
@@ -1,14 +1,10 @@
-d1: QPtrDict: [size: 5; items: (0xbffffa48,4), (0xbffffa4c,5), (0xbffffa3c,1), (0xbffffa40,2), (0xbffffa44,3)]
d1 find 1: 1
d1 find 2: 2
d1 find 3: 3
d1 find 4: 4
d1 find 5: 5
d1 take 4: 4
-d1 remove 2: QPtrDict: [size: 3; items: (0xbffffa4c,5), (0xbffffa3c,1), (0xbffffa44,3)]
d1 find 2: 0x0
d0 is empty: 1
d1 is empty: 0
d1 count: 3
-d2 = d1: QPtrDict: [size: 3; items: (0xbffffa4c,5), (0xbffffa3c,1), (0xbffffa44,3)]
-d1 clear: QPtrDict: [size: 0; items: ]
diff --git a/WebCore/src/kwq/tests/qt/qptrdict-test.cpp b/WebCore/src/kwq/tests/qt/qptrdict-test.cpp
index 97dd7dc..5329a08 100644
--- a/WebCore/src/kwq/tests/qt/qptrdict-test.cpp
+++ b/WebCore/src/kwq/tests/qt/qptrdict-test.cpp
@@ -22,7 +22,7 @@ int main() {
d1.insert(&v5, &v5);
- cout << "d1: " << d1 << endl;
+ //cout << "d1: " << d1 << endl;
cout << "d1 find 1: " << *(d1.find(&v1)) << endl;
cout << "d1 find 2: " << *(d1.find(&v2)) << endl;
@@ -35,7 +35,7 @@ int main() {
cout << "d1 take 4: " << *n2 << endl;
d1.remove(&v2);
- cout << "d1 remove 2: " << d1 << endl;
+ //cout << "d1 remove 2: " << d1 << endl;
cout << "d1 find 2: " << d1.find(&v2) << endl;
cout << "d0 is empty: " << d0.isEmpty() << endl;
@@ -44,9 +44,9 @@ int main() {
cout << "d1 count: " << d1.count() << endl;
d2 = d1;
- cout << "d2 = d1: " << d2 << endl;
+ //cout << "d2 = d1: " << d2 << endl;
d1.clear();
- cout << "d1 clear: " << d1 << endl;
+ //cout << "d1 clear: " << d1 << endl;
return 0;
}
diff --git a/WebCore/src/kwq/tests/qt/qvaluelist-test.chk b/WebCore/src/kwq/tests/qt/qvaluelist-test.chk
index 21b8555..572669c 100644
--- a/WebCore/src/kwq/tests/qt/qvaluelist-test.chk
+++ b/WebCore/src/kwq/tests/qt/qvaluelist-test.chk
@@ -1,4 +1,14 @@
-QValueList: [size: 6; items: 0, 1, 2, 3, 4, 5]
-3
-QValueList: [size: 8; items: 0, 1, 2, 3, 4, 5, 6, 7]
-4, 5, 6, 7
+p0: QValueList: [size: 6; items: 0, 1, 2, 3, 4, 5]
+p0[3]: 3
+p0 += 6,7: QValueList: [size: 8; items: 0, 1, 2, 3, 4, 5, 6, 7]
+p0 iterator: 4, 5, 6, 7
+p0 count: 8
+p0 remove 7: QValueList: [size: 7; items: 0, 1, 2, 3, 4, 5, 6]
+p0 contains 7: 0
+p0 remove 6: 1
+p0 first 6: 0
+p0 last 6: 6
+p1 = p0: QValueList: [size: 7; items: 0, 1, 2, 3, 4, 5, 6]
+p0 isEmpty: 0
+p0 clear: QValueList: [size: 0; items: ]
+p0 isEmpty: 1
diff --git a/WebCore/src/kwq/tests/qt/qvaluelist-test.cpp b/WebCore/src/kwq/tests/qt/qvaluelist-test.cpp
index 1ae999e..e2e8161 100644
--- a/WebCore/src/kwq/tests/qt/qvaluelist-test.cpp
+++ b/WebCore/src/kwq/tests/qt/qvaluelist-test.cpp
@@ -5,6 +5,7 @@
int main() {
QValueList<int> p0;
+ QValueList<int> p1;
p0.append(0);
p0.append(1);
@@ -13,12 +14,13 @@ int main() {
p0.append(4);
p0.append(5);
- cout << p0 << endl;
- cout << p0[3] << endl;
+ cout << "p0: " << p0 << endl;
+ cout << "p0[3]: " << p0[3] << endl;
p0 += 6;
p0 += 7;
- cout << p0 << endl;
+ cout << "p0 += 6,7: " << p0 << endl;
+ cout << "p0 iterator: ";
QValueListIterator<int> it = p0.find(4);
while (it != p0.end()) {
cout << *it;
@@ -28,5 +30,27 @@ int main() {
}
cout << endl;
+ cout << "p0 count: " << p0.count() << endl;
+
+ p0.remove(7);
+ cout << "p0 remove 7: " << p0 << endl;
+
+ cout << "p0 contains 7: " << p0.contains(7) << endl;
+ cout << "p0 remove 6: " << p0.contains(6) << endl;
+
+ cout << "p0 first 6: " << p0.first() << endl;
+ cout << "p0 last 6: " << p0.last() << endl;
+
+ p1 = p0;
+ cout << "p1 = p0: " << p1 << endl;
+
+ cout << "p0 isEmpty: " << p0.isEmpty() << endl;
+ p0.clear();
+ cout << "p0 clear: " << p0 << endl;
+ cout << "p0 isEmpty: " << p0.isEmpty() << endl;
+
+
+
+
return 0;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list