[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:57 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 624897162445ad909f272e8681fc0aae189dffa5
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 28 23:09:09 2001 +0000
Extended qvector and qsize test
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@227 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/tests/qt/qsize-test.chk b/WebCore/kwq/tests/qt/qsize-test.chk
index 3b55ef5..893dfe3 100644
--- a/WebCore/kwq/tests/qt/qsize-test.chk
+++ b/WebCore/kwq/tests/qt/qsize-test.chk
@@ -1,10 +1,39 @@
-QSize: [w: 1; h: 1]
-QSize: [w: 3; h: 3]
-QSize: [w: 4; h: 4]
-0
-0
-0
-1
-1
-0
-QSize: [w: 12; h: 12]
+s1: QSize: [w: 1; h: 1]
+s2: QSize: [w: 3; h: 3]
+s3 = s1+s2: QSize: [w: 4; h: 4]
+s4 = s3: QSize: [w: 4; h: 4]
+s5 = s3: QSize: [w: 4; h: 4]
+s6: QSize: [w: 0; h: 0]
+s7: QSize: [w: 20; h: 20]
+s5 setWidth(10): QSize: [w: 10; h: 4]
+s5 setHeight(10): QSize: [w: 10; h: 10]
+s5 += s1: QSize: [w: 11; h: 11]
+s5 -= s2: QSize: [w: 8; h: 8]
+s5 *= 3: QSize: [w: 24; h: 24]
+s5 /= 2: QSize: [w: 12; h: 12]
+s7 *= 3.33: QSize: [w: 66; h: 66]
+s7 /= 3.33: QSize: [w: 19; h: 19]
+s5 width: 12
+s5 height: 12
+s5 expandedTo 10,15: QSize: [w: 12; h: 15]
+s5 boundedTo 10,15: QSize: [w: 10; h: 15]
+s5 transpose: QSize: [w: 15; h: 10]
+s0 isNull: 0
+s1 isNull: 0
+s6 isNull: 1
+s0 isValid: 0
+s1 isValid: 1
+s6 isValid: 1
+s0 isEmpty: 1
+s1 isEmpty: 0
+s6 isEmpty: 1
+s1 == s4: 0
+s3 == s4: 1
+s1 != s4: 1
+s3 != s4: 0
+s3 * 3.33: QSize: [w: 13; h: 13]
+3.33 * s3: QSize: [w: 13; h: 13]
+2 * s4: QSize: [w: 8; h: 8]
+s4 * 2: QSize: [w: 8; h: 8]
+s4 / 2: QSize: [w: 2; h: 2]
+s4 / 2.22: QSize: [w: 1; h: 1]
diff --git a/WebCore/kwq/tests/qt/qsize-test.cpp b/WebCore/kwq/tests/qt/qsize-test.cpp
index ec2d814..f11c1d7 100644
--- a/WebCore/kwq/tests/qt/qsize-test.cpp
+++ b/WebCore/kwq/tests/qt/qsize-test.cpp
@@ -14,24 +14,66 @@ int main() {
QSize s3 = s1 + s2;
QSize s4 = s3;
QSize s5 = s3;
-
+ QSize s6 = QSize(0,0);
+ QSize s7 = QSize(20,20);
+
+ cout << "s1: " << s1 << endl;
+ cout << "s2: " << s2 << endl;
+ cout << "s3 = s1+s2: " << s3 << endl;
+ cout << "s4 = s3: " << s4 << endl;
+ cout << "s5 = s3: " << s5 << endl;
+ cout << "s6: " << s6 << endl;
+ cout << "s7: " << s7 << endl;
+
s5.setWidth(10);
+ cout << "s5 setWidth(10): " << s5 << endl;
s5.setHeight(10);
+ cout << "s5 setHeight(10): " << s5 << endl;
s5 += s1;
+ cout << "s5 += s1: " << s5 << endl;
s5 -= s2;
+ cout << "s5 -= s2: " << s5 << endl;
s5 *= 3;
+ cout << "s5 *= 3: " << s5 << endl;
s5 /= 2;
+ cout << "s5 /= 2: " << s5 << endl;
+ s7 *= 3.33;
+ cout << "s7 *= 3.33: " << s7 << endl;
+ s7 /= 3.33;
+ cout << "s7 /= 3.33: " << s7 << endl;
+
+ cout << "s5 width: " << s5.width() << endl;
+ cout << "s5 height: " << s5.height() << endl;
+
+ s5 = s5.expandedTo(QSize(10,15));
+ cout << "s5 expandedTo 10,15: " << s5 << endl;
- cout << s1 << endl;
- cout << s2 << endl;
- cout << s3 << endl;
- cout << s0.isNull() << endl;
- cout << s1.isNull() << endl;
- cout << (s1 == s4) << endl;
- cout << (s3 == s4) << endl;
- cout << (s1 != s4) << endl;
- cout << (s3 != s4) << endl;
- cout << s5 << endl;
+ s5 = s5.boundedTo(QSize(10,15));
+ cout << "s5 boundedTo 10,15: " << s5 << endl;
+
+ s5.transpose();
+ cout << "s5 transpose: " << s5 << endl;
+
+ cout << "s0 isNull: " << s0.isNull() << endl;
+ cout << "s1 isNull: " << s1.isNull() << endl;
+ cout << "s6 isNull: " << s6.isNull() << endl;
+ cout << "s0 isValid: " << s0.isValid() << endl;
+ cout << "s1 isValid: " << s1.isValid() << endl;
+ cout << "s6 isValid: " << s6.isValid() << endl;
+ cout << "s0 isEmpty: " << s0.isEmpty() << endl;
+ cout << "s1 isEmpty: " << s1.isEmpty() << endl;
+ cout << "s6 isEmpty: " << s6.isEmpty() << endl;
+ cout << "s1 == s4: " << (s1 == s4) << endl;
+ cout << "s3 == s4: " << (s3 == s4) << endl;
+ cout << "s1 != s4: " << (s1 != s4) << endl;
+ cout << "s3 != s4: " << (s3 != s4) << endl;
+
+ cout << "s3 * 3.33: " << (s3 * 3.33) << endl;
+ cout << "3.33 * s3: " << (3.33 * s3) << endl;
+ cout << "2 * s4: " << (2 * s4) << endl;
+ cout << "s4 * 2: " << (s4 * 2) << endl;
+ cout << "s4 / 2: " << (s4 / 2) << endl;
+ cout << "s4 / 2.22: " << (s4 / 2.22) << endl;
return 0;
}
diff --git a/WebCore/kwq/tests/qt/qtime-test.cpp b/WebCore/kwq/tests/qt/qtime-test.cpp
index 40fe2fc..ecfb3c2 100644
--- a/WebCore/kwq/tests/qt/qtime-test.cpp
+++ b/WebCore/kwq/tests/qt/qtime-test.cpp
@@ -28,7 +28,7 @@ int main() {
cout << "d2 msec: " << d2.msec() << endl;
- elapsedTime = d3.elapsed();
+ elapsedTime = d3.elapsed(); // nothing is printed because output will never match .chk file
elapsedTime = d3.restart();
diff --git a/WebCore/kwq/tests/qt/qvector-test.chk b/WebCore/kwq/tests/qt/qvector-test.chk
new file mode 100644
index 0000000..f942571
--- /dev/null
+++ b/WebCore/kwq/tests/qt/qvector-test.chk
@@ -0,0 +1,15 @@
+v1: QVector: [size: 7; items: 0, 1, 2, 3, 4, 5, 6, ]
+v2 = v1: QVector: [size: 0; items: ]
+v1 find 2: 2
+v1 contains 3: 1
+v1 contains 0: 1
+v1 count: 7
+v1 size: 10
+v1 remove 6: QVector: [size: 6; items: 0, 1, 2, 3, 4, 5, ]
+v1 resize 15: 15
+v1 at 2: 2
+v1[3]: 3
+v2 clear: QVector: [size: 0; items: ]
+v0: 1
+v1: 0
+v2: 1
diff --git a/WebCore/kwq/tests/qt/qvector-test.cpp b/WebCore/kwq/tests/qt/qvector-test.cpp
index 56e8387..f6cbd37 100644
--- a/WebCore/kwq/tests/qt/qvector-test.cpp
+++ b/WebCore/kwq/tests/qt/qvector-test.cpp
@@ -8,8 +8,10 @@
int main() {
- QVector<int> v0 = QVector<int>(10);
-
+ QVector<int> v0;
+ QVector<int> v1 = QVector<int>(10);
+ QVector<int> v2 = v1;
+
int i = 0;
int j = 1;
int k = 2;
@@ -17,21 +19,45 @@ int main() {
int m = 4;
int n = 5;
int o = 6;
-
- v0.insert(0,&i);
- v0.insert(1,&j);
- v0.insert(2,&k);
- v0.insert(3,&l);
- v0.insert(4,&m);
- v0.insert(5,&n);
- v0.insert(6,&o);
+ int *x;
+
+ v1.insert(0,&i);
+ v1.insert(1,&j);
+ v1.insert(2,&k);
+ v1.insert(3,&l);
+ v1.insert(4,&m);
+ v1.insert(5,&n);
+ v1.insert(6,&o);
- cout << v0 << endl;
+ cout << "v1: " << v1 << endl;
+ cout << "v2 = v1: " << v2 << endl;
+
+ cout << "v1 find 2: " << v1.find(&k) << endl;
- cout << "finding index of 2: " << v0.find(&k) << endl;
+ cout << "v1 contains 3: " << v1.containsRef(&l) << endl;
+ cout << "v1 contains 0: " << v1.containsRef(&i) << endl;
+
+ cout << "v1 count: " << v1.count() << endl;
+ cout << "v1 size: " << v1.size() << endl;
+
+ v1.remove(6);
+ cout << "v1 remove 6: " << v1 << endl;
- cout << "contains 3: " << v0.containsRef(&l) << endl;
- cout << "contains 0: " << v0.containsRef(&i) << endl;
+ v1.resize(15);
+ cout << "v1 resize 15: " << v1.size() << endl;
+
+ x = v1.at(2);
+ cout << "v1 at 2: " << *x << endl;
+
+ x = v1[3];
+ cout << "v1[3]: " << *x << endl;
+
+ v2.clear();
+ cout << "v2 clear: " << v2 << endl;
+
+ cout << "v0: " << v0.isEmpty() << endl;
+ cout << "v1: " << v1.isEmpty() << endl;
+ cout << "v2: " << v2.isEmpty() << endl;
return 0;
}
diff --git a/WebCore/src/kwq/tests/qt/qsize-test.chk b/WebCore/src/kwq/tests/qt/qsize-test.chk
index 3b55ef5..893dfe3 100644
--- a/WebCore/src/kwq/tests/qt/qsize-test.chk
+++ b/WebCore/src/kwq/tests/qt/qsize-test.chk
@@ -1,10 +1,39 @@
-QSize: [w: 1; h: 1]
-QSize: [w: 3; h: 3]
-QSize: [w: 4; h: 4]
-0
-0
-0
-1
-1
-0
-QSize: [w: 12; h: 12]
+s1: QSize: [w: 1; h: 1]
+s2: QSize: [w: 3; h: 3]
+s3 = s1+s2: QSize: [w: 4; h: 4]
+s4 = s3: QSize: [w: 4; h: 4]
+s5 = s3: QSize: [w: 4; h: 4]
+s6: QSize: [w: 0; h: 0]
+s7: QSize: [w: 20; h: 20]
+s5 setWidth(10): QSize: [w: 10; h: 4]
+s5 setHeight(10): QSize: [w: 10; h: 10]
+s5 += s1: QSize: [w: 11; h: 11]
+s5 -= s2: QSize: [w: 8; h: 8]
+s5 *= 3: QSize: [w: 24; h: 24]
+s5 /= 2: QSize: [w: 12; h: 12]
+s7 *= 3.33: QSize: [w: 66; h: 66]
+s7 /= 3.33: QSize: [w: 19; h: 19]
+s5 width: 12
+s5 height: 12
+s5 expandedTo 10,15: QSize: [w: 12; h: 15]
+s5 boundedTo 10,15: QSize: [w: 10; h: 15]
+s5 transpose: QSize: [w: 15; h: 10]
+s0 isNull: 0
+s1 isNull: 0
+s6 isNull: 1
+s0 isValid: 0
+s1 isValid: 1
+s6 isValid: 1
+s0 isEmpty: 1
+s1 isEmpty: 0
+s6 isEmpty: 1
+s1 == s4: 0
+s3 == s4: 1
+s1 != s4: 1
+s3 != s4: 0
+s3 * 3.33: QSize: [w: 13; h: 13]
+3.33 * s3: QSize: [w: 13; h: 13]
+2 * s4: QSize: [w: 8; h: 8]
+s4 * 2: QSize: [w: 8; h: 8]
+s4 / 2: QSize: [w: 2; h: 2]
+s4 / 2.22: QSize: [w: 1; h: 1]
diff --git a/WebCore/src/kwq/tests/qt/qsize-test.cpp b/WebCore/src/kwq/tests/qt/qsize-test.cpp
index ec2d814..f11c1d7 100644
--- a/WebCore/src/kwq/tests/qt/qsize-test.cpp
+++ b/WebCore/src/kwq/tests/qt/qsize-test.cpp
@@ -14,24 +14,66 @@ int main() {
QSize s3 = s1 + s2;
QSize s4 = s3;
QSize s5 = s3;
-
+ QSize s6 = QSize(0,0);
+ QSize s7 = QSize(20,20);
+
+ cout << "s1: " << s1 << endl;
+ cout << "s2: " << s2 << endl;
+ cout << "s3 = s1+s2: " << s3 << endl;
+ cout << "s4 = s3: " << s4 << endl;
+ cout << "s5 = s3: " << s5 << endl;
+ cout << "s6: " << s6 << endl;
+ cout << "s7: " << s7 << endl;
+
s5.setWidth(10);
+ cout << "s5 setWidth(10): " << s5 << endl;
s5.setHeight(10);
+ cout << "s5 setHeight(10): " << s5 << endl;
s5 += s1;
+ cout << "s5 += s1: " << s5 << endl;
s5 -= s2;
+ cout << "s5 -= s2: " << s5 << endl;
s5 *= 3;
+ cout << "s5 *= 3: " << s5 << endl;
s5 /= 2;
+ cout << "s5 /= 2: " << s5 << endl;
+ s7 *= 3.33;
+ cout << "s7 *= 3.33: " << s7 << endl;
+ s7 /= 3.33;
+ cout << "s7 /= 3.33: " << s7 << endl;
+
+ cout << "s5 width: " << s5.width() << endl;
+ cout << "s5 height: " << s5.height() << endl;
+
+ s5 = s5.expandedTo(QSize(10,15));
+ cout << "s5 expandedTo 10,15: " << s5 << endl;
- cout << s1 << endl;
- cout << s2 << endl;
- cout << s3 << endl;
- cout << s0.isNull() << endl;
- cout << s1.isNull() << endl;
- cout << (s1 == s4) << endl;
- cout << (s3 == s4) << endl;
- cout << (s1 != s4) << endl;
- cout << (s3 != s4) << endl;
- cout << s5 << endl;
+ s5 = s5.boundedTo(QSize(10,15));
+ cout << "s5 boundedTo 10,15: " << s5 << endl;
+
+ s5.transpose();
+ cout << "s5 transpose: " << s5 << endl;
+
+ cout << "s0 isNull: " << s0.isNull() << endl;
+ cout << "s1 isNull: " << s1.isNull() << endl;
+ cout << "s6 isNull: " << s6.isNull() << endl;
+ cout << "s0 isValid: " << s0.isValid() << endl;
+ cout << "s1 isValid: " << s1.isValid() << endl;
+ cout << "s6 isValid: " << s6.isValid() << endl;
+ cout << "s0 isEmpty: " << s0.isEmpty() << endl;
+ cout << "s1 isEmpty: " << s1.isEmpty() << endl;
+ cout << "s6 isEmpty: " << s6.isEmpty() << endl;
+ cout << "s1 == s4: " << (s1 == s4) << endl;
+ cout << "s3 == s4: " << (s3 == s4) << endl;
+ cout << "s1 != s4: " << (s1 != s4) << endl;
+ cout << "s3 != s4: " << (s3 != s4) << endl;
+
+ cout << "s3 * 3.33: " << (s3 * 3.33) << endl;
+ cout << "3.33 * s3: " << (3.33 * s3) << endl;
+ cout << "2 * s4: " << (2 * s4) << endl;
+ cout << "s4 * 2: " << (s4 * 2) << endl;
+ cout << "s4 / 2: " << (s4 / 2) << endl;
+ cout << "s4 / 2.22: " << (s4 / 2.22) << endl;
return 0;
}
diff --git a/WebCore/src/kwq/tests/qt/qtime-test.cpp b/WebCore/src/kwq/tests/qt/qtime-test.cpp
index 40fe2fc..ecfb3c2 100644
--- a/WebCore/src/kwq/tests/qt/qtime-test.cpp
+++ b/WebCore/src/kwq/tests/qt/qtime-test.cpp
@@ -28,7 +28,7 @@ int main() {
cout << "d2 msec: " << d2.msec() << endl;
- elapsedTime = d3.elapsed();
+ elapsedTime = d3.elapsed(); // nothing is printed because output will never match .chk file
elapsedTime = d3.restart();
diff --git a/WebCore/src/kwq/tests/qt/qvector-test.chk b/WebCore/src/kwq/tests/qt/qvector-test.chk
new file mode 100644
index 0000000..f942571
--- /dev/null
+++ b/WebCore/src/kwq/tests/qt/qvector-test.chk
@@ -0,0 +1,15 @@
+v1: QVector: [size: 7; items: 0, 1, 2, 3, 4, 5, 6, ]
+v2 = v1: QVector: [size: 0; items: ]
+v1 find 2: 2
+v1 contains 3: 1
+v1 contains 0: 1
+v1 count: 7
+v1 size: 10
+v1 remove 6: QVector: [size: 6; items: 0, 1, 2, 3, 4, 5, ]
+v1 resize 15: 15
+v1 at 2: 2
+v1[3]: 3
+v2 clear: QVector: [size: 0; items: ]
+v0: 1
+v1: 0
+v2: 1
diff --git a/WebCore/src/kwq/tests/qt/qvector-test.cpp b/WebCore/src/kwq/tests/qt/qvector-test.cpp
index 56e8387..f6cbd37 100644
--- a/WebCore/src/kwq/tests/qt/qvector-test.cpp
+++ b/WebCore/src/kwq/tests/qt/qvector-test.cpp
@@ -8,8 +8,10 @@
int main() {
- QVector<int> v0 = QVector<int>(10);
-
+ QVector<int> v0;
+ QVector<int> v1 = QVector<int>(10);
+ QVector<int> v2 = v1;
+
int i = 0;
int j = 1;
int k = 2;
@@ -17,21 +19,45 @@ int main() {
int m = 4;
int n = 5;
int o = 6;
-
- v0.insert(0,&i);
- v0.insert(1,&j);
- v0.insert(2,&k);
- v0.insert(3,&l);
- v0.insert(4,&m);
- v0.insert(5,&n);
- v0.insert(6,&o);
+ int *x;
+
+ v1.insert(0,&i);
+ v1.insert(1,&j);
+ v1.insert(2,&k);
+ v1.insert(3,&l);
+ v1.insert(4,&m);
+ v1.insert(5,&n);
+ v1.insert(6,&o);
- cout << v0 << endl;
+ cout << "v1: " << v1 << endl;
+ cout << "v2 = v1: " << v2 << endl;
+
+ cout << "v1 find 2: " << v1.find(&k) << endl;
- cout << "finding index of 2: " << v0.find(&k) << endl;
+ cout << "v1 contains 3: " << v1.containsRef(&l) << endl;
+ cout << "v1 contains 0: " << v1.containsRef(&i) << endl;
+
+ cout << "v1 count: " << v1.count() << endl;
+ cout << "v1 size: " << v1.size() << endl;
+
+ v1.remove(6);
+ cout << "v1 remove 6: " << v1 << endl;
- cout << "contains 3: " << v0.containsRef(&l) << endl;
- cout << "contains 0: " << v0.containsRef(&i) << endl;
+ v1.resize(15);
+ cout << "v1 resize 15: " << v1.size() << endl;
+
+ x = v1.at(2);
+ cout << "v1 at 2: " << *x << endl;
+
+ x = v1[3];
+ cout << "v1[3]: " << *x << endl;
+
+ v2.clear();
+ cout << "v2 clear: " << v2 << endl;
+
+ cout << "v0: " << v0.isEmpty() << endl;
+ cout << "v1: " << v1.isEmpty() << endl;
+ cout << "v2: " << v2.isEmpty() << endl;
return 0;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list