[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 4cf678cd98fea894efd49059c98744344ddcff25
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 26 21:07:46 2001 +0000

    Added tests for isEmpty, cleaned up output for qstack-test
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@203 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/tests/qt/qstack-test.chk b/WebCore/kwq/tests/qt/qstack-test.chk
index 7268411..dd0bbc1 100644
--- a/WebCore/kwq/tests/qt/qstack-test.chk
+++ b/WebCore/kwq/tests/qt/qstack-test.chk
@@ -1,12 +1,13 @@
-QStack: [size: 0; items: ]
-push test: 
-QStack: [size: 5; items: 4, 3, 2, 1, 0]
-pop test: 
-4
-3
-2
-1
-0
-QStack: [size: 5; items: 4, 3, 2, 1, 0]
-clear test: 
-QStack: [size: 0; items: ]
+s0: QStack: [size: 0; items: ]
+s0 push: QStack: [size: 5; items: 4, 3, 2, 1, 0]
+s1 = s0: QStack: [size: 5; items: 4, 3, 2, 1, 0]
+s1 count: 5
+s1 pop: 4
+s1 pop: 3
+s1 pop: 2
+s1 pop: 1
+s1 pop: 0
+s1: QStack: [size: 0; items: ]
+s0 isEmpty: 0
+s1 isEmpty: 1
+s0 clear: QStack: [size: 0; items: ]
diff --git a/WebCore/kwq/tests/qt/qstack-test.cpp b/WebCore/kwq/tests/qt/qstack-test.cpp
index e87602c..2a95c3a 100644
--- a/WebCore/kwq/tests/qt/qstack-test.cpp
+++ b/WebCore/kwq/tests/qt/qstack-test.cpp
@@ -6,36 +6,38 @@ int main() {
 
     QStack<int> s0;
     QStack<int> s1 = QStack<int>();
-
+    QStack<int> s2;
+    
     int i0 = 0;
     int i1 = 1;
     int i2 = 2;
     int i3 = 3;
     int i4 = 4;
 
-    cout << s0 << endl;
+    cout << "s0: " << s0 << endl;
 
     s0.push(&i0);
     s0.push(&i1);
     s0.push(&i2);
     s0.push(&i3);
     s0.push(&i4);
-
-    cout << "push test: " << endl;
-    cout << s0 << endl;
+    cout << "s0 push: " << s0 << endl;
     
     s1 = s0;
-    cout << "pop test: " << endl;
+    cout << "s1 = s0: " << s1 << endl;
+    cout << "s1 count: " << s1.count() << endl;
+    
     int count = s1.count();
     for (int i = 0; i < count; i++) {
-        cout << *(s1.pop()) << endl;
+        cout << "s1 pop: "<< *(s1.pop()) << endl;
     }
-
-    s1 = s0;
-    cout << s1 << endl;
-    cout << "clear test: " << endl;
-    s1.clear();
-    cout << s1 << endl;
+    cout << "s1: " << s1 << endl;
+    
+    cout << "s0 isEmpty: " << s0.isEmpty() << endl;
+    cout << "s1 isEmpty: " << s1.isEmpty() << endl;
+    
+    s0.clear();  // not needed for KWQ?
+    cout << "s0 clear: "<< s0 << endl;
 
     return 0;
 }
diff --git a/WebCore/src/kwq/tests/qt/qstack-test.chk b/WebCore/src/kwq/tests/qt/qstack-test.chk
index 7268411..dd0bbc1 100644
--- a/WebCore/src/kwq/tests/qt/qstack-test.chk
+++ b/WebCore/src/kwq/tests/qt/qstack-test.chk
@@ -1,12 +1,13 @@
-QStack: [size: 0; items: ]
-push test: 
-QStack: [size: 5; items: 4, 3, 2, 1, 0]
-pop test: 
-4
-3
-2
-1
-0
-QStack: [size: 5; items: 4, 3, 2, 1, 0]
-clear test: 
-QStack: [size: 0; items: ]
+s0: QStack: [size: 0; items: ]
+s0 push: QStack: [size: 5; items: 4, 3, 2, 1, 0]
+s1 = s0: QStack: [size: 5; items: 4, 3, 2, 1, 0]
+s1 count: 5
+s1 pop: 4
+s1 pop: 3
+s1 pop: 2
+s1 pop: 1
+s1 pop: 0
+s1: QStack: [size: 0; items: ]
+s0 isEmpty: 0
+s1 isEmpty: 1
+s0 clear: QStack: [size: 0; items: ]
diff --git a/WebCore/src/kwq/tests/qt/qstack-test.cpp b/WebCore/src/kwq/tests/qt/qstack-test.cpp
index e87602c..2a95c3a 100644
--- a/WebCore/src/kwq/tests/qt/qstack-test.cpp
+++ b/WebCore/src/kwq/tests/qt/qstack-test.cpp
@@ -6,36 +6,38 @@ int main() {
 
     QStack<int> s0;
     QStack<int> s1 = QStack<int>();
-
+    QStack<int> s2;
+    
     int i0 = 0;
     int i1 = 1;
     int i2 = 2;
     int i3 = 3;
     int i4 = 4;
 
-    cout << s0 << endl;
+    cout << "s0: " << s0 << endl;
 
     s0.push(&i0);
     s0.push(&i1);
     s0.push(&i2);
     s0.push(&i3);
     s0.push(&i4);
-
-    cout << "push test: " << endl;
-    cout << s0 << endl;
+    cout << "s0 push: " << s0 << endl;
     
     s1 = s0;
-    cout << "pop test: " << endl;
+    cout << "s1 = s0: " << s1 << endl;
+    cout << "s1 count: " << s1.count() << endl;
+    
     int count = s1.count();
     for (int i = 0; i < count; i++) {
-        cout << *(s1.pop()) << endl;
+        cout << "s1 pop: "<< *(s1.pop()) << endl;
     }
-
-    s1 = s0;
-    cout << s1 << endl;
-    cout << "clear test: " << endl;
-    s1.clear();
-    cout << s1 << endl;
+    cout << "s1: " << s1 << endl;
+    
+    cout << "s0 isEmpty: " << s0.isEmpty() << endl;
+    cout << "s1 isEmpty: " << s1.isEmpty() << endl;
+    
+    s0.clear();  // not needed for KWQ?
+    cout << "s0 clear: "<< s0 << endl;
 
     return 0;
 }

-- 
WebKit Debian packaging