1 files changed, 21 insertions, 26 deletions

diff --git a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
index efbcdc78e0..802bbe9963 100644
--- a/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
+++ b/tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
@@ -1,31 +1,26 @@
 /****************************************************************************
 **
 ** Copyright (C) 2014 Ivan Komissarov <ABBAPOH@gmail.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -61,9 +56,9 @@ void tst_QStorageInfo::defaultValues()
     QVERIFY(!storage.isRoot());
     QVERIFY(storage.device().isEmpty());
     QVERIFY(storage.fileSystemType().isEmpty());
-    QVERIFY(storage.bytesTotal() == -1);
-    QVERIFY(storage.bytesFree() == -1);
-    QVERIFY(storage.bytesAvailable() == -1);
+    QCOMPARE(storage.bytesTotal(), -1);
+    QCOMPARE(storage.bytesFree(), -1);
+    QCOMPARE(storage.bytesAvailable(), -1);
 }
 
 void tst_QStorageInfo::operatorEqual()
@@ -71,19 +66,19 @@ void tst_QStorageInfo::operatorEqual()
     {
         QStorageInfo storage1 = QStorageInfo::root();
         QStorageInfo storage2(QDir::rootPath());
-        QVERIFY(storage1 == storage2);
+        QCOMPARE(storage1, storage2);
     }
 
     {
         QStorageInfo storage1(QCoreApplication::applicationDirPath());
         QStorageInfo storage2(QCoreApplication::applicationFilePath());
-        QVERIFY(storage1 == storage2);
+        QCOMPARE(storage1, storage2);
     }
 
     {
         QStorageInfo storage1;
         QStorageInfo storage2;
-        QVERIFY(storage1 == storage2);
+        QCOMPARE(storage1, storage2);
     }
 }
 
@@ -184,15 +179,15 @@ void tst_QStorageInfo::caching()
 
     qint64 free = storage1.bytesFree();
     QStorageInfo storage2(storage1);
-    QVERIFY(free == storage2.bytesFree());
+    QCOMPARE(free, storage2.bytesFree());
 
     file.write(QByteArray(1024*1024, '\0'));
     file.flush();
 
-    QVERIFY(free == storage1.bytesFree());
-    QVERIFY(free == storage2.bytesFree());
+    QCOMPARE(free, storage1.bytesFree());
+    QCOMPARE(free, storage2.bytesFree());
     storage2.refresh();
-    QVERIFY(storage1 == storage2);
+    QCOMPARE(storage1, storage2);
     QVERIFY(free != storage2.bytesFree());
 }
 #endif