From ccf27301e04addef0ed0cb6c7e832216cc3c12a8 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@nokia.com>
Date: Sun, 23 Oct 2011 13:15:25 +0200
Subject: test: Split `qcontiguouscache' unit and benchmark tests

Moving three benchmark tests from 'tests/auto' to 'tests/benchmarks'.
Also removing 'qttest_p4' usage while we are at it.

- void asScrollingList();
- void cacheBenchmark();
- void contiguousCacheBenchmark();

were moved to 'tests/benchmarks/corelib/tools/qcontiguouscache'

Task-number: QTQAINFRA-353
Change-Id: Icbdd852f9c14c3df042d2e19abd42af6c645a3cb
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 .../qcontiguouscache/tst_qcontiguouscache.cpp      | 133 ---------------------
 1 file changed, 133 deletions(-)

(limited to 'tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp')

diff --git a/tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp b/tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp
index 076b6ca63b..96731f7d78 100644
--- a/tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp
+++ b/tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp
@@ -63,15 +63,10 @@ private slots:
     void prepend_data();
     void prepend();
 
-    void asScrollingList();
-
     void complexType();
 
     void operatorAt();
 
-    void cacheBenchmark();
-    void contiguousCacheBenchmark();
-
     void setCapacity();
 
     void zeroCapacity();
@@ -216,105 +211,6 @@ void tst_QContiguousCache::prepend()
     }
 }
 
-void tst_QContiguousCache::asScrollingList()
-{
-    int i;
-    QContiguousCache<int> c(10);
-
-    // Once allocated QContiguousCache should not
-    // allocate any additional memory for non
-    // complex data types.
-    QBENCHMARK {
-        // simulate scrolling in a list of items;
-        for(i = 0; i < 10; ++i) {
-            QCOMPARE(c.available(), 10-i);
-            c.append(i);
-        }
-
-        QCOMPARE(c.firstIndex(), 0);
-        QCOMPARE(c.lastIndex(), 9);
-        QCOMPARE(c.first(), 0);
-        QCOMPARE(c.last(), 9);
-        QVERIFY(!c.containsIndex(-1));
-        QVERIFY(!c.containsIndex(10));
-        QCOMPARE(c.available(), 0);
-
-        for (i = 0; i < 10; ++i) {
-            QVERIFY(c.containsIndex(i));
-            QCOMPARE(c.at(i), i);
-            QCOMPARE(c[i], i);
-            QCOMPARE(((const QContiguousCache<int>)c)[i], i);
-        }
-
-        for (i = 10; i < 30; ++i)
-            c.append(i);
-
-        QCOMPARE(c.firstIndex(), 20);
-        QCOMPARE(c.lastIndex(), 29);
-        QCOMPARE(c.first(), 20);
-        QCOMPARE(c.last(), 29);
-        QVERIFY(!c.containsIndex(19));
-        QVERIFY(!c.containsIndex(30));
-        QCOMPARE(c.available(), 0);
-
-        for (i = 20; i < 30; ++i) {
-            QVERIFY(c.containsIndex(i));
-            QCOMPARE(c.at(i), i);
-            QCOMPARE(c[i], i);
-            QCOMPARE(((const QContiguousCache<int> )c)[i], i);
-        }
-
-        for (i = 19; i >= 10; --i)
-            c.prepend(i);
-
-        QCOMPARE(c.firstIndex(), 10);
-        QCOMPARE(c.lastIndex(), 19);
-        QCOMPARE(c.first(), 10);
-        QCOMPARE(c.last(), 19);
-        QVERIFY(!c.containsIndex(9));
-        QVERIFY(!c.containsIndex(20));
-        QCOMPARE(c.available(), 0);
-
-        for (i = 10; i < 20; ++i) {
-            QVERIFY(c.containsIndex(i));
-            QCOMPARE(c.at(i), i);
-            QCOMPARE(c[i], i);
-            QCOMPARE(((const QContiguousCache<int> )c)[i], i);
-        }
-
-        for (i = 200; i < 220; ++i)
-            c.insert(i, i);
-
-        QCOMPARE(c.firstIndex(), 210);
-        QCOMPARE(c.lastIndex(), 219);
-        QCOMPARE(c.first(), 210);
-        QCOMPARE(c.last(), 219);
-        QVERIFY(!c.containsIndex(209));
-        QVERIFY(!c.containsIndex(300));
-        QCOMPARE(c.available(), 0);
-
-        for (i = 210; i < 220; ++i) {
-            QVERIFY(c.containsIndex(i));
-            QCOMPARE(c.at(i), i);
-            QCOMPARE(c[i], i);
-            QCOMPARE(((const QContiguousCache<int> )c)[i], i);
-        }
-        c.clear(); // needed to reset benchmark
-    }
-
-    // from a specific bug that was encountered.  100 to 299 cached, attempted to cache 250 - 205 via insert, failed.
-    // bug was that item at 150 would instead be item that should have been inserted at 250
-    c.setCapacity(200);
-    for(i = 100; i < 300; ++i)
-        c.insert(i, i);
-    for (i = 250; i <= 306; ++i)
-        c.insert(i, 1000+i);
-    for (i = 107; i <= 306; ++i) {
-        QVERIFY(c.containsIndex(i));
-        QCOMPARE(c.at(i), i < 250 ? i : 1000+i);
-    }
-}
-
 struct RefCountingClassData
 {
     QBasicAtomicInt ref;
@@ -421,35 +317,6 @@ void tst_QContiguousCache::operatorAt()
     QCOMPARE(original.refCount(), 22);
 }
 
-/*
-    Benchmarks must be near identical in tasks to be fair.
-    QCache uses pointers to ints as its a requirement of QCache,
-    whereas QContiguousCache doesn't support pointers (won't free them).
-    Given the ability to use simple data types is a benefit, its
-    fair.  Although this obviously must take into account we are
-    testing QContiguousCache use cases here, QCache has its own
-    areas where it is the more sensible class to use.
-*/
-void tst_QContiguousCache::cacheBenchmark()
-{
-    QBENCHMARK {
-        QCache<int, int> cache;
-        cache.setMaxCost(100);
-
-        for (int i = 0; i < 1000; i++)
-            cache.insert(i, new int(i));
-    }
-}
-
-void tst_QContiguousCache::contiguousCacheBenchmark()
-{
-    QBENCHMARK {
-        QContiguousCache<int> contiguousCache(100);
-        for (int i = 0; i < 1000; i++)
-            contiguousCache.insert(i, i);
-    }
-}
-
 void tst_QContiguousCache::setCapacity()
 {
     int i;
-- 
cgit v1.2.3