Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJocelyn Turcotte <jturcotte@woboq.com>2017-02-07 21:31:55 +0300
committerJocelyn Turcotte <jturcotte@woboq.com>2017-02-14 16:32:41 +0300
commitb26db062d23a54357695522680b196d0ad89558b (patch)
treeb1c456a9e3b254c64c29851108a94a4952b2fac6 /test
parent611f633ba8fbc5cfa2c38b61b1f446f380c71e24 (diff)
Fix the UNIT_TESTING build on Windows
- Put all tests in the bin directory so that DLLs can be loaded - Add missing exports - Skip tests that use code depending on zlib - The "GMT" timezone is named differently, use the int constructor instead 5 tests are still failing, it's not really worth fixing at the moment since no developper is currently using Windows as its main platform.
Diffstat (limited to 'test')
-rw-r--r--test/owncloud_add_test.cmake2
-rw-r--r--test/syncenginetestutils.h2
-rw-r--r--test/testchecksumvalidator.cpp11
3 files changed, 11 insertions, 4 deletions
diff --git a/test/owncloud_add_test.cmake b/test/owncloud_add_test.cmake
index 338526d87..bf15ab890 100644
--- a/test/owncloud_add_test.cmake
+++ b/test/owncloud_add_test.cmake
@@ -12,6 +12,7 @@ macro(owncloud_add_test test_class additional_cpp)
add_executable(${OWNCLOUD_TEST_CLASS}Test test${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${additional_cpp})
qt5_use_modules(${OWNCLOUD_TEST_CLASS}Test Test Sql Xml Network)
+ set_target_properties(${OWNCLOUD_TEST_CLASS}Test PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY})
target_link_libraries(${OWNCLOUD_TEST_CLASS}Test
updater
@@ -40,6 +41,7 @@ macro(owncloud_add_benchmark test_class additional_cpp)
add_executable(${OWNCLOUD_TEST_CLASS}Bench benchmarks/bench${OWNCLOUD_TEST_CLASS_LOWERCASE}.cpp ${additional_cpp})
qt5_use_modules(${OWNCLOUD_TEST_CLASS}Bench Test Sql Xml Network)
+ set_target_properties(${OWNCLOUD_TEST_CLASS}Bench PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY})
target_link_libraries(${OWNCLOUD_TEST_CLASS}Bench
updater
diff --git a/test/syncenginetestutils.h b/test/syncenginetestutils.h
index 5a938a99a..232cd419d 100644
--- a/test/syncenginetestutils.h
+++ b/test/syncenginetestutils.h
@@ -345,7 +345,7 @@ public:
} else
xml.writeEmptyElement(davUri, QStringLiteral("resourcetype"));
- auto gmtDate = fileInfo.lastModified.toTimeZone(QTimeZone("GMT"));
+ auto gmtDate = fileInfo.lastModified.toTimeZone(QTimeZone(0));
auto stringDate = gmtDate.toString("ddd, dd MMM yyyy HH:mm:ss 'GMT'");
xml.writeTextElement(davUri, QStringLiteral("getlastmodified"), stringDate);
xml.writeTextElement(davUri, QStringLiteral("getcontentlength"), QString::number(fileInfo.size));
diff --git a/test/testchecksumvalidator.cpp b/test/testchecksumvalidator.cpp
index c83f37377..88c3b1d34 100644
--- a/test/testchecksumvalidator.cpp
+++ b/test/testchecksumvalidator.cpp
@@ -55,7 +55,6 @@ using namespace OCC;
private slots:
void initTestCase() {
- qDebug() << Q_FUNC_INFO;
_root = QDir::tempPath() + "/" + "test_" + QString::number(qrand());
QDir rootDir(_root);
@@ -65,7 +64,9 @@ using namespace OCC;
}
void testUploadChecksummingAdler() {
-
+#ifndef ZLIB_FOUND
+ QSKIP("ZLIB not found.", SkipSingle);
+#else
ComputeChecksum *vali = new ComputeChecksum(this);
_expectedType = "Adler32";
vali->setChecksumType(_expectedType);
@@ -81,6 +82,7 @@ using namespace OCC;
loop.exec();
delete vali;
+#endif
}
void testUploadChecksummingMd5() {
@@ -119,7 +121,9 @@ using namespace OCC;
}
void testDownloadChecksummingAdler() {
-
+#ifndef ZLIB_FOUND
+ QSKIP("ZLIB not found.", SkipSingle);
+#else
QByteArray adler = checkSumAdlerC;
adler.append(":");
adler.append(FileSystem::calcAdler32( _testfile ));
@@ -143,6 +147,7 @@ using namespace OCC;
QTRY_VERIFY(_errorSeen);
delete vali;
+#endif
}