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

gramps gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:50:15 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 72f0ad0657dcc107599c015467c78030ce5848d8
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 12 17:02:07 2001 +0000

    Re-enabled several tests
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@316 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/tests/qt/qstring-test.chk b/WebCore/kwq/tests/qt/qstring-test.chk
index f853aeb..8132fbe 100644
--- a/WebCore/kwq/tests/qt/qstring-test.chk
+++ b/WebCore/kwq/tests/qt/qstring-test.chk
@@ -41,6 +41,10 @@ s19: 221545
 s19: 221545
 s19: 221545
 s19: 221545
+221545
+24937
+221545
+24937
 s20: This is a test. 44, 56.780000
 s21: Apple Computer Inc.
 s22: Apple
@@ -55,6 +59,8 @@ s24 append s22: The answer is: 22Apple
 s24 prepend c2: 2The answer is: 22Apple
 s24 prepend s22: Apple2The answer is: 22Apple
 s24 remove 0-7: he answer is: 22Apple
+he answer is: 2Apple2Apple
+he answer is: 2cApple2Apple
 s25 replace RegExp "a" with "e": There ere e lot of e's in e sentence such es this one
 s27: 22.45
 s27: 356
@@ -79,7 +85,17 @@ s34: This is a longer string
 ch3: This is an even longer string
 c4: T
 s33 == ch3: 0
+c3 == s33: 0
 s33 == s34: 0
+s33 == c4: 0
 s33 != ch3: 1
+c3 != s33: 1
 s33 != s34: 1
+s33 != c4: 1
+ch3 + s33: This is an even longer stringThis is a string
+c4 + s33: TThis is a string
 'a' + s33: aThis is a string
+0
+1
+0
+1
diff --git a/WebCore/kwq/tests/qt/qstring-test.cpp b/WebCore/kwq/tests/qt/qstring-test.cpp
index 2348b8f..6cf69c3 100644
--- a/WebCore/kwq/tests/qt/qstring-test.cpp
+++ b/WebCore/kwq/tests/qt/qstring-test.cpp
@@ -116,10 +116,10 @@ int main() {
     cout << "s19: " << s19.toInt() << endl;
     cout << "s19: " << s19.toLong() << endl;
     cout << "s19: " << s19.toUInt() << endl;
-    //cout << s19.toDouble() << endl;   //Am I properly testing this?
-    //cout << s19.toShort() << endl;
-    //cout << s19.toULong() << endl;
-    //cout << s19.toUShort() << endl;
+    cout << s19.toDouble() << endl;   //Am I properly testing this?
+    cout << s19.toShort() << endl;
+    cout << s19.toULong() << endl;
+    cout << s19.toUShort() << endl;
     
     QString s20;
     cout << "s20: " << s20.sprintf("This is a %s. %d, %f", "test", 44, 56.78) << endl;
@@ -144,8 +144,8 @@ int main() {
     cout << "s24 prepend s22: " << s24.prepend(s22) << endl;
     cout << "s24 remove 0-7: " << s24.remove(0, 7) << endl;
     //cout << s24.insert(15, c, 4) << endl;
-    //cout << s24.insert(15, s22) << endl;
-    //cout << s24.insert(15, 'c') << endl;
+    cout << s24.insert(15, s22) << endl;
+    cout << s24.insert(15, 'c') << endl;
     //cout << s24.append('c') << endl;
     //cout << s24.prepend('c') << endl;
     
@@ -195,29 +195,29 @@ int main() {
     cout << "ch3: " << ch3 << endl;
     cout << "c4: " << c4 << endl;
     cout << "s33 == ch3: " << (s33 == ch3) << endl;   // I should test strings that are equal as well
-    //cout << "c3 == s33: "<< (c4 == s33) << endl;
+    cout << "c3 == s33: "<< (c4 == s33) << endl;
     cout << "s33 == s34: "<< (s33 == s34) << endl;
-    //cout << "s33 == c4: "<< (s33 == c4) << endl;
+    cout << "s33 == c4: "<< (s33 == c4) << endl;
     cout << "s33 != ch3: " << (s33 != ch3) << endl;
-    //cout << "c3 != s33: "<< (c4 != s33) << endl;
+    cout << "c3 != s33: "<< (c4 != s33) << endl;
     cout << "s33 != s34: "<< (s33 != s34) << endl;
-    //cout << "s33 != c4: "<< (s33 != c4) << endl; 
-    //cout << "ch3 + s33: " << (ch3 + s33) << endl;
-    //cout << "c4 + s33: " << (c4 + s33) << endl;
+    cout << "s33 != c4: "<< (s33 != c4) << endl; 
+    cout << "ch3 + s33: " << (ch3 + s33) << endl;
+    cout << "c4 + s33: " << (c4 + s33) << endl;
     cout << "\'a\' + s33: " << ('a' + s33) << endl;
     
     //cout << (s33 < c4) << endl;
     //cout << (c4 < s33) << endl;
-    //cout << (s33 < s34) << endl;
+    cout << (s33 < s34) << endl;
     //cout << (s33 > c4) << endl;
     //cout << (c4 > s33) << endl;
-    //cout << (s33 > s34) << endl;   
+    cout << (s33 > s34) << endl;   
     //cout << (s33 <= c4) << endl;
     //cout << (c4 <= s33) << endl;
-    //cout << (s33 <= s34) << endl;
+    cout << (s33 <= s34) << endl;
     //cout << (s33 >= c4) << endl;
     //cout << (c4 >= s33) << endl;
-    //cout << (s33 >= s34) << endl;
+    cout << (s33 >= s34) << endl;
     
     
         
diff --git a/WebCore/src/kwq/tests/qt/qstring-test.chk b/WebCore/src/kwq/tests/qt/qstring-test.chk
index f853aeb..8132fbe 100644
--- a/WebCore/src/kwq/tests/qt/qstring-test.chk
+++ b/WebCore/src/kwq/tests/qt/qstring-test.chk
@@ -41,6 +41,10 @@ s19: 221545
 s19: 221545
 s19: 221545
 s19: 221545
+221545
+24937
+221545
+24937
 s20: This is a test. 44, 56.780000
 s21: Apple Computer Inc.
 s22: Apple
@@ -55,6 +59,8 @@ s24 append s22: The answer is: 22Apple
 s24 prepend c2: 2The answer is: 22Apple
 s24 prepend s22: Apple2The answer is: 22Apple
 s24 remove 0-7: he answer is: 22Apple
+he answer is: 2Apple2Apple
+he answer is: 2cApple2Apple
 s25 replace RegExp "a" with "e": There ere e lot of e's in e sentence such es this one
 s27: 22.45
 s27: 356
@@ -79,7 +85,17 @@ s34: This is a longer string
 ch3: This is an even longer string
 c4: T
 s33 == ch3: 0
+c3 == s33: 0
 s33 == s34: 0
+s33 == c4: 0
 s33 != ch3: 1
+c3 != s33: 1
 s33 != s34: 1
+s33 != c4: 1
+ch3 + s33: This is an even longer stringThis is a string
+c4 + s33: TThis is a string
 'a' + s33: aThis is a string
+0
+1
+0
+1
diff --git a/WebCore/src/kwq/tests/qt/qstring-test.cpp b/WebCore/src/kwq/tests/qt/qstring-test.cpp
index 2348b8f..6cf69c3 100644
--- a/WebCore/src/kwq/tests/qt/qstring-test.cpp
+++ b/WebCore/src/kwq/tests/qt/qstring-test.cpp
@@ -116,10 +116,10 @@ int main() {
     cout << "s19: " << s19.toInt() << endl;
     cout << "s19: " << s19.toLong() << endl;
     cout << "s19: " << s19.toUInt() << endl;
-    //cout << s19.toDouble() << endl;   //Am I properly testing this?
-    //cout << s19.toShort() << endl;
-    //cout << s19.toULong() << endl;
-    //cout << s19.toUShort() << endl;
+    cout << s19.toDouble() << endl;   //Am I properly testing this?
+    cout << s19.toShort() << endl;
+    cout << s19.toULong() << endl;
+    cout << s19.toUShort() << endl;
     
     QString s20;
     cout << "s20: " << s20.sprintf("This is a %s. %d, %f", "test", 44, 56.78) << endl;
@@ -144,8 +144,8 @@ int main() {
     cout << "s24 prepend s22: " << s24.prepend(s22) << endl;
     cout << "s24 remove 0-7: " << s24.remove(0, 7) << endl;
     //cout << s24.insert(15, c, 4) << endl;
-    //cout << s24.insert(15, s22) << endl;
-    //cout << s24.insert(15, 'c') << endl;
+    cout << s24.insert(15, s22) << endl;
+    cout << s24.insert(15, 'c') << endl;
     //cout << s24.append('c') << endl;
     //cout << s24.prepend('c') << endl;
     
@@ -195,29 +195,29 @@ int main() {
     cout << "ch3: " << ch3 << endl;
     cout << "c4: " << c4 << endl;
     cout << "s33 == ch3: " << (s33 == ch3) << endl;   // I should test strings that are equal as well
-    //cout << "c3 == s33: "<< (c4 == s33) << endl;
+    cout << "c3 == s33: "<< (c4 == s33) << endl;
     cout << "s33 == s34: "<< (s33 == s34) << endl;
-    //cout << "s33 == c4: "<< (s33 == c4) << endl;
+    cout << "s33 == c4: "<< (s33 == c4) << endl;
     cout << "s33 != ch3: " << (s33 != ch3) << endl;
-    //cout << "c3 != s33: "<< (c4 != s33) << endl;
+    cout << "c3 != s33: "<< (c4 != s33) << endl;
     cout << "s33 != s34: "<< (s33 != s34) << endl;
-    //cout << "s33 != c4: "<< (s33 != c4) << endl; 
-    //cout << "ch3 + s33: " << (ch3 + s33) << endl;
-    //cout << "c4 + s33: " << (c4 + s33) << endl;
+    cout << "s33 != c4: "<< (s33 != c4) << endl; 
+    cout << "ch3 + s33: " << (ch3 + s33) << endl;
+    cout << "c4 + s33: " << (c4 + s33) << endl;
     cout << "\'a\' + s33: " << ('a' + s33) << endl;
     
     //cout << (s33 < c4) << endl;
     //cout << (c4 < s33) << endl;
-    //cout << (s33 < s34) << endl;
+    cout << (s33 < s34) << endl;
     //cout << (s33 > c4) << endl;
     //cout << (c4 > s33) << endl;
-    //cout << (s33 > s34) << endl;   
+    cout << (s33 > s34) << endl;   
     //cout << (s33 <= c4) << endl;
     //cout << (c4 <= s33) << endl;
-    //cout << (s33 <= s34) << endl;
+    cout << (s33 <= s34) << endl;
     //cout << (s33 >= c4) << endl;
     //cout << (c4 >= s33) << endl;
-    //cout << (s33 >= s34) << endl;
+    cout << (s33 >= s34) << endl;
     
     
         

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list