Merge pull request #719 from tuxmaster5000/owncloud
Rename owncloud tests to nextcloud
This commit is contained in:
commit
556e8d39aa
|
@ -12,10 +12,10 @@ include_directories(${CMAKE_SOURCE_DIR}/src
|
|||
${SQLITE3_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
include(owncloud_add_test.cmake)
|
||||
include(nextcloud_add_test.cmake)
|
||||
|
||||
owncloud_add_test(OwncloudPropagator "")
|
||||
owncloud_add_test(Updater "")
|
||||
nextcloud_add_test(NextcloudPropagator "")
|
||||
nextcloud_add_test(Updater "")
|
||||
|
||||
SET(FolderWatcher_SRC ../src/gui/folderwatcher.cpp)
|
||||
|
||||
|
@ -29,33 +29,33 @@ IF( APPLE )
|
|||
list(APPEND FolderWatcher_SRC ../src/gui/folderwatcher_mac.cpp)
|
||||
list(APPEND FolderWatcher_SRC ../src/gui/socketapisocket_mac.mm)
|
||||
ENDIF()
|
||||
owncloud_add_test(NetrcParser ../src/cmd/netrcparser.cpp)
|
||||
owncloud_add_test(OwnSql "")
|
||||
owncloud_add_test(SyncJournalDB "")
|
||||
owncloud_add_test(SyncFileItem "")
|
||||
owncloud_add_test(ConcatUrl "")
|
||||
owncloud_add_test(XmlParse "")
|
||||
owncloud_add_test(ChecksumValidator "")
|
||||
nextcloud_add_test(NetrcParser ../src/cmd/netrcparser.cpp)
|
||||
nextcloud_add_test(OwnSql "")
|
||||
nextcloud_add_test(SyncJournalDB "")
|
||||
nextcloud_add_test(SyncFileItem "")
|
||||
nextcloud_add_test(ConcatUrl "")
|
||||
nextcloud_add_test(XmlParse "")
|
||||
nextcloud_add_test(ChecksumValidator "")
|
||||
|
||||
owncloud_add_test(ExcludedFiles "")
|
||||
nextcloud_add_test(ExcludedFiles "")
|
||||
|
||||
owncloud_add_test(FileSystem "")
|
||||
owncloud_add_test(Utility "")
|
||||
owncloud_add_test(SyncEngine "syncenginetestutils.h")
|
||||
owncloud_add_test(SyncMove "syncenginetestutils.h")
|
||||
owncloud_add_test(SyncConflict "syncenginetestutils.h")
|
||||
owncloud_add_test(SyncFileStatusTracker "syncenginetestutils.h")
|
||||
owncloud_add_test(ChunkingNg "syncenginetestutils.h")
|
||||
owncloud_add_test(UploadReset "syncenginetestutils.h")
|
||||
owncloud_add_test(AllFilesDeleted "syncenginetestutils.h")
|
||||
owncloud_add_test(Blacklist "syncenginetestutils.h")
|
||||
owncloud_add_test(FolderWatcher "${FolderWatcher_SRC}")
|
||||
nextcloud_add_test(FileSystem "")
|
||||
nextcloud_add_test(Utility "")
|
||||
nextcloud_add_test(SyncEngine "syncenginetestutils.h")
|
||||
nextcloud_add_test(SyncMove "syncenginetestutils.h")
|
||||
nextcloud_add_test(SyncConflict "syncenginetestutils.h")
|
||||
nextcloud_add_test(SyncFileStatusTracker "syncenginetestutils.h")
|
||||
nextcloud_add_test(ChunkingNg "syncenginetestutils.h")
|
||||
nextcloud_add_test(UploadReset "syncenginetestutils.h")
|
||||
nextcloud_add_test(AllFilesDeleted "syncenginetestutils.h")
|
||||
nextcloud_add_test(Blacklist "syncenginetestutils.h")
|
||||
nextcloud_add_test(FolderWatcher "${FolderWatcher_SRC}")
|
||||
|
||||
if( UNIX AND NOT APPLE )
|
||||
owncloud_add_test(InotifyWatcher "${FolderWatcher_SRC}")
|
||||
nextcloud_add_test(InotifyWatcher "${FolderWatcher_SRC}")
|
||||
endif(UNIX AND NOT APPLE)
|
||||
|
||||
owncloud_add_benchmark(LargeSync "syncenginetestutils.h")
|
||||
nextcloud_add_benchmark(LargeSync "syncenginetestutils.h")
|
||||
|
||||
SET(FolderMan_SRC ../src/gui/folderman.cpp)
|
||||
list(APPEND FolderMan_SRC ../src/gui/folder.cpp )
|
||||
|
@ -69,9 +69,9 @@ list(APPEND FolderMan_SRC ../src/gui/connectionvalidator.cpp )
|
|||
list(APPEND FolderMan_SRC ../src/gui/clientproxy.cpp )
|
||||
list(APPEND FolderMan_SRC ${FolderWatcher_SRC})
|
||||
list(APPEND FolderMan_SRC stub.cpp )
|
||||
owncloud_add_test(FolderMan "${FolderMan_SRC}")
|
||||
nextcloud_add_test(FolderMan "${FolderMan_SRC}")
|
||||
|
||||
owncloud_add_test(OAuth "syncenginetestutils.h;../src/gui/creds/oauth.cpp")
|
||||
nextcloud_add_test(OAuth "syncenginetestutils.h;../src/gui/creds/oauth.cpp")
|
||||
|
||||
configure_file(test_journal.db "${PROJECT_BINARY_DIR}/bin/test_journal.db" COPYONLY)
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
find_package(Qt5 COMPONENTS Core Test Xml Network REQUIRED)
|
||||
|
||||
macro(owncloud_add_test test_class additional_cpp)
|
||||
macro(nextcloud_add_test test_class additional_cpp)
|
||||
set(CMAKE_AUTOMOC TRUE)
|
||||
set(OWNCLOUD_TEST_CLASS ${test_class})
|
||||
string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE)
|
||||
|
@ -19,7 +19,7 @@ macro(owncloud_add_test test_class additional_cpp)
|
|||
add_test(NAME ${OWNCLOUD_TEST_CLASS}Test COMMAND ${OWNCLOUD_TEST_CLASS}Test)
|
||||
endmacro()
|
||||
|
||||
macro(owncloud_add_benchmark test_class additional_cpp)
|
||||
macro(nextcloud_add_benchmark test_class additional_cpp)
|
||||
set(CMAKE_AUTOMOC TRUE)
|
||||
set(OWNCLOUD_TEST_CLASS ${test_class})
|
||||
string(TOLOWER "${OWNCLOUD_TEST_CLASS}" OWNCLOUD_TEST_CLASS_LOWERCASE)
|
|
@ -15,14 +15,14 @@ namespace OCC {
|
|||
QString OWNCLOUDSYNC_EXPORT createDownloadTmpFileName(const QString &previous);
|
||||
}
|
||||
|
||||
class TestOwncloudPropagator : public QObject
|
||||
class TestNextcloudPropagator : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
private slots:
|
||||
void testUpdateErrorFromSession()
|
||||
{
|
||||
// OwncloudPropagator propagator( NULL, QLatin1String("test1"), QLatin1String("test2"), new ProgressDatabase);
|
||||
// NextcloudPropagator propagator( NULL, QLatin1String("test1"), QLatin1String("test2"), new ProgressDatabase);
|
||||
QVERIFY( true );
|
||||
}
|
||||
|
||||
|
@ -78,5 +78,5 @@ private slots:
|
|||
}
|
||||
};
|
||||
|
||||
QTEST_APPLESS_MAIN(TestOwncloudPropagator)
|
||||
#include "testowncloudpropagator.moc"
|
||||
QTEST_APPLESS_MAIN(TestNextcloudPropagator)
|
||||
#include "testnextcloudpropagator.moc"
|
Loading…
Reference in New Issue