Граф коммитов

153 Коммитов

Автор SHA1 Сообщение Дата
Markus Goetz ac0e08cc91 Merge branch '1.8' into 1.9 2015-05-12 23:02:58 +02:00
Markus Goetz bcc896fb6e Qt4: Fix test 2015-05-12 22:55:54 +02:00
Daniel Molkentin a36df4aa4b Merge remote-tracking branch 'origin/1.8' into 1.9 2015-05-12 09:57:22 +02:00
Markus Goetz 625e61516f Propagator: Limit length of temporary file name #2789 (fixup)
Fix 22c35c4d15
2015-05-11 15:42:35 +02:00
Markus Goetz 22c35c4d15 Propagator: Limit length of temporary file name #2789 2015-05-08 16:42:03 +02:00
Markus Goetz 0359c775e0 Discovery: Test better, treat invalid hrefs as error #3176 2015-05-07 17:19:48 +02:00
Daniel Molkentin 77a28a81eb Bump to 1.9 2015-05-06 17:01:05 +02:00
Markus Goetz 2866e56c51 LsColXMLParser: More testing 2 2015-04-14 14:56:25 +02:00
Markus Goetz 2074bdbb19 LsColXMLParser: More testing 2015-04-14 14:41:48 +02:00
Klaas Freitag d212ac7d16 test xmlparser: Verify call to parse() 2015-04-14 13:45:09 +02:00
Klaas Freitag d2bae21b14 Added unit test for XML Parser class. 2015-04-14 13:43:05 +02:00
Christian Kamm 0464947610 Remove extra ; to silence warning. 2015-02-25 07:14:05 +01:00
Olivier Goffart 193fca4a8b SyncFileItem::operator<: must return false when two items are equal
Fixes #2852
2015-02-18 12:41:06 +01:00
Olivier Goffart 04bb67ef45 Fix Qt4 build
The automatic registration of metatype only came with qt5
2015-02-13 21:41:09 +01:00
Christian Kamm 40dbc78407 concatUrl: Remove manual parsing, add test. #2817 2015-02-13 14:53:55 +01:00
Klaas Freitag 4710609cb9 Tests: Removed C++11 Hokuspokus to not confuse and kill elderly compilers. 2015-02-13 11:07:53 +01:00
Olivier Goffart b9161aa06c libsync: Fix a case in which canceling the sync would result in some folder never being sync'ed
The problem occurs because of the sorting of items when we have things like

bigfolder
bigfolder/bigsubfolder
bigfolder-2

Then, because dashes come before slash in ascii, the bigfolder-2 would come before its content
and the propagator would thinkg bigfolder is empty and save the etag before it is processed

Should fix issue #2832
2015-02-12 20:00:04 +01:00
Elan Ruusamäe e0656af1fc use touch from path
on some systems touch(1) is in /bin, not /usr/bin.
instead hardcoding another path, take it from $PATH, like other commands used here (rm, echo)
2015-02-08 01:27:46 +02:00
Daniel Molkentin 9a4f4854de Some fixes for favlink manual test 2015-02-06 15:29:36 +01:00
Olivier Goffart 907b79d3b8 Utility: Use appropriate unit when converting from bytes to human readable units
We must not use the SI units if we use power of 2

I believe that we should use SI units and power of 10
But since the server still use power of 2, we need to show the same numbers

But at least we use the proper standard IEC unit that are explicit
2015-01-15 14:06:17 +01:00
Olivier Goffart 863731fd6a Revert "Utility: Use SI units"
This reverts commit 7445fa7ef7.
and commit f654c53c35.

The server still use wrong powers, so we still need to use the same
2015-01-15 13:56:51 +01:00
Olivier Goffart f654c53c35 fixing testOctetsToString 2015-01-15 09:58:40 +01:00
Christian Kamm 53d5de685c Merge remote-tracking branch 'origin/1.7'
Conflicts:
	src/gui/folder.cpp
	src/gui/folder.h
	src/libsync/networkjobs.cpp
	src/libsync/owncloudpropagator.h
	src/libsync/propagatedownload.cpp
2014-12-10 13:01:36 +01:00
Christian Kamm 40f44c2389 DB: Delete corrupt database. #2547
* Also use readonly DB access for SocketAPI.
2014-12-04 15:35:55 +01:00
Daniel Molkentin 3016844dd7 Merge branch 'master' into rename_client
Conflicts:
	README.md
	src/gui/folderman.cpp
	src/gui/settingsdialog.cpp
	src/libsync/accessmanager.cpp
	src/libsync/propagateupload.h
2014-12-02 13:37:22 +01:00
Olivier Goffart 1c58b75ac2 Merge branch '1.7' 2014-11-21 11:08:20 +01:00
Christian Kamm e3b07f569a FolderWatcherTest: Use Utility::usleep. 2014-11-21 08:21:36 +01:00
Christian Kamm 6d09f1b6c0 Folder watcher now reports changing paths instead of dirs. 2014-11-20 12:51:16 +01:00
Christian Kamm f275002ebe Merge branch '1.7' 2014-11-20 12:41:06 +01:00
Christian Kamm d4e0941c27 Windows filewatcher: switch to ReadDirectoryChangesW.
Based on danimo's #2454 fix for #2455 and related to #2297.
2014-11-20 12:36:17 +01:00
Christian Kamm 4d7b8bdb25 Merge remote-tracking branch 'origin/1.7'
Conflicts:
	OWNCLOUD.cmake
	test/CMakeLists.txt
	test/testfolderwatcher.h
2014-11-19 14:45:25 +01:00
Christian Kamm 421a8cc6b7 Windows: Make unit tests compile. 2014-11-19 14:18:37 +01:00
Daniel Molkentin 1297ac77b9 Fix tests 2014-11-09 22:37:56 +01:00
Christian Kamm 4e20a02fe5 SyncJournalDB: Add filesize column to metadata.
* Alter table to include column.
* Make get/set in SyncJournalDB store and load it.
* Make csync recover the stat_t's size member from it.
2014-10-29 09:53:36 +01:00
Daniel Molkentin dc1e73dcb7 Merge remote-tracking branch 'origin/1.7'
Conflicts:
	src/libsync/syncjournaldb.cpp
	test/CMakeLists.txt
2014-10-28 23:27:58 -04:00
Klaas Freitag b691521662 tests: Fix CSync Journal test, use real CSYNC struct from csync_private.
This fixes bug #2396
2014-10-27 13:15:33 +01:00
Christian Kamm e5269a4151 Add SyncJournalDB autotests.
There also was a bug in syncjournaldb: in some error conditions the
sql query wasn't reset properly. We now always reset a query before
calling bindValue.
2014-10-23 15:15:47 +02:00
Christian Kamm 7ae0338f5c Merge remote-tracking branch 'origin/1.7'
Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/socketapi.h
	src/libsync/syncengine.h
	test/CMakeLists.txt
2014-10-22 10:41:55 +02:00
Klaas Freitag 2f740fe471 tests: Added unicode read an write testcase for ownsql. 2014-10-16 21:21:47 +02:00
Klaas Freitag 0094c1ecf5 Make the sync work with new sql implementation. 2014-10-14 20:51:51 +02:00
Klaas Freitag 6b5fcf53eb Test module for the new sql implementation. 2014-10-14 20:51:34 +02:00
Olivier Goffart d7d241196e tests: add the source dir in the include paths 2014-09-22 08:58:35 +02:00
Olivier Goffart eab488e64f compile after merge 2014-09-18 19:58:04 +02:00
Olivier Goffart 50e718b1e7 Merge branch '1.7'
Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/folder.cpp
	src/gui/socketapi.cpp
	translations/mirall_ca.ts
	translations/mirall_cs.ts
	translations/mirall_de.ts
	translations/mirall_el.ts
	translations/mirall_en.ts
	translations/mirall_es.ts
	translations/mirall_es_AR.ts
	translations/mirall_et.ts
	translations/mirall_eu.ts
	translations/mirall_fa.ts
	translations/mirall_fi.ts
	translations/mirall_fr.ts
	translations/mirall_gl.ts
	translations/mirall_hu.ts
	translations/mirall_it.ts
	translations/mirall_ja.ts
	translations/mirall_nl.ts
	translations/mirall_pl.ts
	translations/mirall_pt.ts
	translations/mirall_pt_BR.ts
	translations/mirall_ru.ts
	translations/mirall_sk.ts
	translations/mirall_sl.ts
	translations/mirall_sv.ts
	translations/mirall_th.ts
	translations/mirall_tr.ts
	translations/mirall_uk.ts
	translations/mirall_zh_CN.ts
	translations/mirall_zh_TW.ts
2014-09-18 17:10:21 +02:00
Daniel Molkentin fe023e2229 Allow passing user/pass explicitly or via netrc
#2211
2014-09-16 23:52:28 +02:00
Daniel Molkentin 2c6324e3e5 Fix tests 2014-08-27 10:27:29 +02:00
Daniel Molkentin 902bb7a198 Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
Conflicts:
	src/CMakeLists.txt
	src/gui/accountsettings.cpp
	src/gui/folderwizard.cpp
	src/gui/settingsdialog.cpp
	src/libsync/syncengine.h
2014-08-26 11:29:42 +02:00
Klaas Freitag 8d819956d3 Tests: Fixed the CSync statedb test defined in the mirall module. 2014-08-15 18:33:04 +02:00
Daniel Molkentin df3c3bca02 Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
Olivier Goffart d3b599b727 Fix build of the test on Qt5 2014-07-10 10:42:02 +02:00
Olivier Goffart 45d1567057 Move Folder, FolderMan, and FolderWatcher outside of owncloudsync
Those class are maintaining the folder for the mirall configuration
They are not usefull in command line clients

Also the FolderWatcher is only used by the folder and not used by the
command line clients
2014-07-09 22:44:08 +02:00
Markus Goetz b48ab79a92 CSync & statedb: Remove uid/gid
Columns are still in the DB as we don't want to break any compatibility.
2014-06-06 13:41:16 +02:00
Klaas Freitag 87386ce001 Fix testcase.
It failed because the directory where change happened triggered a
notification within the second before, so the event was skipped.
2014-05-14 12:49:11 +02:00
hefee 822650719b RemoveADir test should realy test, if it is notified 2014-05-11 17:08:30 +02:00
Olivier Goffart 5bceb6f787 fix test compilation 2014-03-28 11:02:18 +01:00
Olivier Goffart 98d7ff5116 Don't create .ctmp of sync journal
Fixes #1559
2014-03-26 10:25:50 +01:00
Klaas Freitag d2e1923694 Fix compile warning. 2014-03-20 12:57:57 +01:00
Klaas Freitag 39924d79cb Add new test to test the csync database code. 2014-03-20 11:15:28 +01:00
Olivier Goffart 1e43d1fa49 Add missing license headers in tests
LGPL for csync tests,  GPL for mirall tests
2014-02-24 11:08:58 +01:00
Daniel Molkentin 086694f284 Fix Qt5: Tests require Xml Module 2014-02-04 13:12:13 +01:00
Daniel Molkentin ff569603f5 Updater: More tests 2014-01-29 12:01:35 +01:00
Daniel Molkentin 1aa050bea9 Add Tests, make Updater classes into a static lib 2014-01-29 10:43:21 +01:00
Klaas Freitag 3d6718315c Fix Include dirs and add tests. 2014-01-23 13:23:27 +01:00
Klaas Freitag e3723fcfc2 Add a new folder watcher implementation for Linux. 2014-01-23 13:23:27 +01:00
Daniel Molkentin 83e628b9f7 Revert "fix test"
This reverts commit f35e2efd4e.
2014-01-22 00:00:34 +01:00
Daniel Molkentin f35e2efd4e fix test 2014-01-21 16:34:52 +01:00
Olivier Goffart e7e319e3f5 Fix compilation of the owncloudpropagator test
This test does nothing, remove problematic line"
2014-01-20 15:44:43 +01:00
Klaas Freitag e0d8d93b50 Removed obsolete inotify class of folderwatcher. 2014-01-13 16:07:52 +01:00
Klaas Freitag e5804b5d12 Use a more Qt'ish folder recursing method, remove unused class.
Added unit test.
2014-01-08 14:36:42 +01:00
Olivier Goffart 313832de8d Put the progress database within the journal 2013-10-16 12:01:14 +02:00
Olivier Goffart afc13e70b9 fix Qt5 test compilation 2013-10-03 22:51:40 +02:00
Olivier Goffart 7ea3fc1533 Fix compilation of the test 2013-10-03 14:45:00 +02:00
Thomas Müller 60ef5535c6 fixing testOctetsToString
(cherry picked from commit 78c8f13645)
2013-09-13 20:14:53 +02:00
Daniel Molkentin c6ed7dc586 Tests: Find test lib in Qt5 2013-09-05 18:06:00 +02:00
Daniel Molkentin 573aaec9fd Fix propagator test 2013-09-04 17:29:19 +02:00
Klaas Freitag 8fe102662d Merge branch 'propagator-ng': Fixes to work with new LGPL ocsync.
Conflicts:
	src/mirall/csyncthread.cpp
2013-09-04 16:33:06 +02:00
Daniel Molkentin bfdd488b00 Tests: make tests run in parallel 2013-08-29 14:50:55 +02:00
Daniel Molkentin 54c8809bf4 Tests: Fix indentation 2013-08-29 14:50:18 +02:00
Daniel Molkentin 0873665bec Tests: Move all comparisons from QVERIFY to QCOMPARE 2013-08-29 14:48:40 +02:00
Olivier Goffart 02b3033ca3 Use the same convention as on the server to format strings
* use power of 10 SI units
 * use "B" instead of "bytes"
 * use at least 2 significant digit, but no more than one digit after
   the period
2013-08-29 12:06:41 +02:00
Daniel Molkentin 9f89a2fe76 More adjustments around the application name
- libname is now derived from binary name (which is lowercase)
- remove superflouos reimplementation of appName() in owncloud theme
- APPLICATION_SHORTNAME is now optional (and if not set, equals
  APPLICATION_NAME
2013-08-23 10:30:03 +02:00
Olivier Goffart 0589bfc51b Merge branch 'master' into propagator-ng
This just fix the conflict.
Do not compile or work yet

Conflicts:
	src/CMakeLists.txt
	src/mirall/csyncthread.cpp
	src/mirall/csyncthread.h
	src/mirall/owncloudfolder.cpp
	src/mirall/syncfileitem.h
	test/CMakeLists.txt
2013-08-14 15:19:21 +02:00
Daniel Molkentin 46b870e260 Revert "run tests verbosely"
This reverts commit ff2d59d32f.
2013-08-09 14:45:49 +02:00
Daniel Molkentin ff2d59d32f run tests verbosely 2013-08-09 13:27:05 +02:00
Daniel Molkentin 0ced165b3e Add tests for Utility namespace 2013-08-09 13:09:41 +02:00
Daniel Molkentin 60a116f3e0 Add tests for Utility namespace 2013-08-09 12:56:43 +02:00
Klaas Freitag ba01a697e6 Renamed test case to get rid of stinking name. 2013-08-05 09:39:06 +02:00
Daniel Molkentin b70c2f5c20 torture scripts: fix description 2013-06-06 11:05:21 +02:00
Daniel Molkentin 033249423f Add torture scripts + standard layout files 2013-06-05 21:36:55 +02:00
Klaas Freitag 946258ca59 Created a test file for ownCloudPropagator. Not much in yet. 2013-05-05 12:36:42 +02:00
Daniel Molkentin dcc8f9fa6c Fix favlink manual test 2013-03-25 18:00:25 +01:00
Daniel Molkentin 408547611b Manual test for favlinks 2013-03-25 12:53:40 +01:00
Dominik Schmidt 351f9aedfb Add testing skeleton 2012-10-26 20:24:12 +02:00
Klaas Freitag d7e161a161 Added a testplan to test systematically. 2012-04-18 12:00:29 +02:00
Duncan Mac-Vicar P 83eeeb4216 Simplify how the event queue works. Now it is just a timer
that gets restarted on every new event, and the processing starts
when no events reset the timer for the event interval.
2011-04-06 22:35:08 +02:00
Duncan Mac-Vicar P 25315dfdec fix warning 2011-04-06 17:03:10 +02:00
Duncan Mac-Vicar P c19c9859e3 add alias to folder 2011-04-06 09:52:02 +02:00
Duncan Mac-Vicar P f22caca96b - refactor tests repeat-myself with a cmake macro
- enable cmake testing
2011-03-31 20:26:51 +02:00
Duncan Mac-Vicar P 9ac0397ff9 unneeded 2011-03-31 20:26:32 +02:00
Duncan Mac-Vicar P 3f32499c4e If the first event happens before 5 secs after starting the
program, it will always cause it to queue it to avoid event
flood (5 secs). So don't init the QTime for last event, and then
check if it is null.
2011-03-31 19:07:45 +02:00