diff --git a/libs/resources/tests/TestResourceStorage.cpp b/libs/resources/tests/TestResourceStorage.cpp index fa8cbb8a9e..2d3b3d1b60 100644 --- a/libs/resources/tests/TestResourceStorage.cpp +++ b/libs/resources/tests/TestResourceStorage.cpp @@ -1,72 +1,60 @@ /* * Copyright (C) 2017 Boudewijn Rempt * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public License * along with this library; see the file COPYING.LIB. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ #include "TestResourceStorage.h" #include #include #ifndef FILES_DATA_DIR #error "FILES_DATA_DIR not set. A directory with the data used for testing installing resources" #endif void TestResourceStorage ::testStorage() { { KisResourceStorage storage(QString(FILES_DATA_DIR)); QVERIFY(storage.type() == KisResourceStorage::StorageType::Folder); QVERIFY(storage.valid()); } { KisResourceStorage storage(QString(FILES_DATA_DIR) + "/bundles/test1.bundle"); QVERIFY(storage.type() == KisResourceStorage::StorageType::Bundle); QVERIFY(storage.valid()); } { KisResourceStorage storage(QString(FILES_DATA_DIR) + "/bundles/test2.bundle"); QVERIFY(storage.type() == KisResourceStorage::StorageType::Bundle); QVERIFY(storage.valid()); } - { - KisResourceStorage storage(QString(FILES_DATA_DIR) + "/abr/test.abr"); - QVERIFY(storage.type() == KisResourceStorage::StorageType::AdobeBrushLibrary); - QVERIFY(storage.valid()); - } - - { - KisResourceStorage storage(QString(FILES_DATA_DIR) + "/brushes/test.gbr"); - QVERIFY(storage.type() == KisResourceStorage::StorageType::Memory); - QVERIFY(storage.valid()); - } - { KisResourceStorage storage(""); QVERIFY(storage.type() == KisResourceStorage::StorageType::Unknown); QVERIFY(!storage.valid()); } } QTEST_MAIN(TestResourceStorage) diff --git a/libs/resources/tests/data/abr/test.abr b/libs/resources/tests/data/abr/test.abr deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libs/resources/tests/data/asl/test.asl b/libs/resources/tests/data/asl/test.asl deleted file mode 100644 index e69de29bb2..0000000000