diff --git a/autotest-external.sh b/autotest-external.sh
index 6128f68136f9a83c8d1996095bfb80732d30413a..0a3fafbd2a6f0b36debe5abd0d21b9e77bfaa246 100755
--- a/autotest-external.sh
+++ b/autotest-external.sh
@@ -39,8 +39,8 @@ PHPUNIT_VERSION=$("$PHPUNIT" --version | cut -d" " -f2)
PHPUNIT_MAJOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f1)
PHPUNIT_MINOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f2)
-if ! [ $PHPUNIT_MAJOR_VERSION -gt 3 -o \( $PHPUNIT_MAJOR_VERSION -eq 3 -a $PHPUNIT_MINOR_VERSION -ge 7 \) ]; then
- echo "phpunit version >= 3.7 required. Version found: $PHPUNIT_VERSION" >&2
+if ! [ $PHPUNIT_MAJOR_VERSION -gt 4 -o \( $PHPUNIT_MAJOR_VERSION -eq 4 -a $PHPUNIT_MINOR_VERSION -ge 4 \) ]; then
+ echo "phpunit version >= 4.4 required. Version found: $PHPUNIT_VERSION" >&2
exit 4
fi
diff --git a/autotest.cmd b/autotest.cmd
deleted file mode 100644
index 2129e2d30d650be37125f07c42cf9a1c694b13d6..0000000000000000000000000000000000000000
--- a/autotest.cmd
+++ /dev/null
@@ -1,169 +0,0 @@
-::
-:: ownCloud
-::
-:: @author Thomas Müller
-:: @author Tobias Ramforth (translated into Windows batch file)
-::
-:: @copyright 2012, 2013 Thomas Müller thomas.mueller@tmit.eu
-::
-
-@echo off
-
-set BASEDIR=%~dp0
-set DATADIR=%BASEDIR%data-autotest
-
-:: create autoconfig for sqlite, mysql, postgresql and mssql
-echo ^<?php > .\tests\autoconfig-sqlite.php
-echo $AUTOCONFIG ^= array ^( >> .\tests\autoconfig-sqlite.php
-echo 'installed' ^=^> false^, >> .\tests\autoconfig-sqlite.php
-echo 'dbtype' ^=^> 'sqlite'^, >> .\tests\autoconfig-sqlite.php
-echo 'dbtableprefix' ^=^> 'oc_'^, >> .\tests\autoconfig-sqlite.php
-echo 'adminlogin' ^=^> 'admin'^, >> .\tests\autoconfig-sqlite.php
-echo 'adminpass' ^=^> 'admin'^, >> .\tests\autoconfig-sqlite.php
-echo 'directory' ^=^> '%DATADIR%'^, >> .\tests\autoconfig-sqlite.php
-echo ^)^; >> .\tests\autoconfig-sqlite.php
-
-echo ^<?php > .\tests\autoconfig-mysql.php
-echo $AUTOCONFIG ^= array ^( >> .\tests\autoconfig-mysql.php
-echo 'installed' ^=^> false^, >> .\tests\autoconfig-mysql.php
-echo 'dbtype' ^=^> 'mysql'^, >> .\tests\autoconfig-mysql.php
-echo 'dbtableprefix' ^=^> 'oc_'^, >> .\tests\autoconfig-mysql.php
-echo 'adminlogin' ^=^> 'admin'^, >> .\tests\autoconfig-mysql.php
-echo 'adminpass' ^=^> 'admin'^, >> .\tests\autoconfig-mysql.php
-echo 'directory' ^=^> '%DATADIR%'^, >> .\tests\autoconfig-mysql.php
-echo 'dbuser' ^=^> 'oc_autotest'^, >> .\tests\autoconfig-mysql.php
-echo 'dbname' ^=^> 'oc_autotest'^, >> .\tests\autoconfig-mysql.php
-echo 'dbhost' ^=^> 'localhost'^, >> .\tests\autoconfig-mysql.php
-echo 'dbpass' ^=^> 'owncloud'^, >> .\tests\autoconfig-mysql.php
-echo ^)^; >> .\tests\autoconfig-mysql.php
-
-echo ^<?php > .\tests\autoconfig-pgsql.php
-echo $AUTOCONFIG ^= array ^( >> .\tests\autoconfig-pgsql.php
-echo 'installed' ^=^> false^, >> .\tests\autoconfig-pgsql.php
-echo 'dbtype' ^=^> 'pgsql'^, >> .\tests\autoconfig-pgsql.php
-echo 'dbtableprefix' ^=^> 'oc_'^, >> .\tests\autoconfig-pgsql.php
-echo 'adminlogin' ^=^> 'admin'^, >> .\tests\autoconfig-pgsql.php
-echo 'adminpass' ^=^> 'admin'^, >> .\tests\autoconfig-pgsql.php
-echo 'directory' ^=^> '%DATADIR%'^, >> .\tests\autoconfig-pgsql.php
-echo 'dbuser' ^=^> 'oc_autotest'^, >> .\tests\autoconfig-pgsql.php
-echo 'dbname' ^=^> 'oc_autotest'^, >> .\tests\autoconfig-pgsql.php
-echo 'dbhost' ^=^> 'localhost'^, >> .\tests\autoconfig-pgsql.php
-echo 'dbpass' ^=^> 'owncloud'^, >> .\tests\autoconfig-pgsql.php
-echo ^)^; >> .\tests\autoconfig-pgsql.php
-
-echo ^<?php > .\tests\autoconfig-mssql.php
-echo $AUTOCONFIG ^= array ^( >> .\tests\autoconfig-mssql.php
-echo 'installed' ^=^> false^, >> .\tests\autoconfig-mssql.php
-echo 'dbtype' ^=^> 'mssql'^, >> .\tests\autoconfig-mssql.php
-echo 'dbtableprefix' ^=^> 'oc_'^, >> .\tests\autoconfig-mssql.php
-echo 'adminlogin' ^=^> 'admin'^, >> .\tests\autoconfig-mssql.php
-echo 'adminpass' ^=^> 'admin'^, >> .\tests\autoconfig-mssql.php
-echo 'directory' ^=^> '%DATADIR%'^, >> .\tests\autoconfig-mssql.php
-echo 'dbuser' ^=^> 'oc_autotest'^, >> .\tests\autoconfig-mssql.php
-echo 'dbname' ^=^> 'oc_autotest'^, >> .\tests\autoconfig-mssql.php
-echo 'dbhost' ^=^> 'localhost\sqlexpress'^, >> .\tests\autoconfig-mssql.php
-echo 'dbpass' ^=^> 'owncloud'^, >> .\tests\autoconfig-mssql.php
-echo ^)^; >> .\tests\autoconfig-mssql.php
-
-echo localhost:5432:*:oc_autotest:owncloud > %APPDATA%\postgresql\pgpass.conf
-
-@echo on
-
-:: Back up existing (dev) config if one exists
-if exist config\config.php (
- copy /y config\config.php config\config-autotest-backup.php
-)
-
-::
-:: start test execution
-::
-if [%1] == [] (
- @echo "Running on all database backends"
- call:execute_tests "sqlite" "%2"
- call:execute_tests "mysql" "%2"
- call:execute_tests "mssql" "%2"
- ::call:execute_tests "ora" "%2"
- call:execute_tests "pgsql" "%2"
-) else (
- call:execute_tests "%1" "%2"
-)
-
-goto:restore_config
-
-goto:eof
-
-:restore_config
- :: Restore existing config
- if exist config\config-autotest-backup.php (
- copy /y config\config-autotest-backup.php config\config.php
- )
-goto:eof
-
-:execute_tests
- @echo "Setup environment for %~1 testing ..."
- :: back to root folder
- cd %BASEDIR%
-
- :: revert changes to tests\data
- git checkout tests\data\*
-
- :: reset data directory
- rmdir /s /q %DATADIR%
- md %DATADIR%
-
- :: remove the old config file
- :: del /q /f config\config.php
- copy /y tests\preseed-config.php config\config.php
-
- :: drop database
- if "%~1" == "mysql" mysql -u oc_autotest -powncloud -e "DROP DATABASE oc_autotest"
-
- if "%~1" == "pgsql" dropdb -h localhost -p 5432 -U oc_autotest -w oc_autotest
-
- :: we assume a sqlexpress installation
- if "%~1" == "mssql" sqlcmd -S localhost\sqlexpress -U oc_autotest -P owncloud -Q "IF EXISTS (SELECT name FROM sys.databases WHERE name=N'oc_autotest') DROP DATABASE [oc_autotest]"
-
- :: copy autoconfig
- copy /y %BASEDIR%\tests\autoconfig-%~1.php %BASEDIR%\config\autoconfig.php
-
- :: trigger installation
- @echo INDEX
- call php -f index.php
- @echo END INDEX
-
- ::test execution
- @echo "Testing with %~1 ..."
- cd tests
- rmdir /s /q coverage-html-%~1
- md coverage-html-%~1
- php -f enable_all.php
-
- :: no external files on windows for now
- cd ..
- php occ app:disable files_external
- cd tests
-
- call phpunit --bootstrap bootstrap.php --configuration phpunit-autotest.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1 %~2
-
- @echo "Done with testing %~1 ..."
- cd %BASEDIR%
-goto:eof
-
-::
-:: NOTES on mysql:
-:: - CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY 'owncloud';
-:: - grant access permissions: grant all on oc_autotest.* to 'oc_autotest'@'localhost';
-::
-:: NOTES on pgsql:
-:: - su - postgres
-:: - createuser -P (enter username and password and enable superuser)
-:: - to enable dropdb I decided to add following line to pg_hba.conf (this is not the safest way but I don't care for the testing machine):
-:: local all all trust
-::
-:: NOTES on mssql:
-:: we assume the usage of a local installed sqlexpress
-:: create a user 'oc_autotest' with password 'owncloud' and assign the server role 'dbcreator'
-:: make sure the sqlserver is configured to allow sql authentication
-::
-
-
diff --git a/autotest.sh b/autotest.sh
index 48b73283499e459f78d6dfd36c3e0e9536181676..61c21dc0ba23a9ef0c7497d592ca0baa3bb9c6dd 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -69,8 +69,8 @@ PHPUNIT_VERSION=$($PHPUNIT --version | cut -d" " -f2)
PHPUNIT_MAJOR_VERSION=$(echo "$PHPUNIT_VERSION" | cut -d"." -f1)
PHPUNIT_MINOR_VERSION=$(echo "$PHPUNIT_VERSION" | cut -d"." -f2)
-if ! [ "$PHPUNIT_MAJOR_VERSION" -gt 3 -o \( "$PHPUNIT_MAJOR_VERSION" -eq 3 -a "$PHPUNIT_MINOR_VERSION" -ge 7 \) ]; then
- echo "phpunit version >= 3.7 required. Version found: $PHPUNIT_VERSION" >&2
+if ! [ "$PHPUNIT_MAJOR_VERSION" -gt 4 -o \( "$PHPUNIT_MAJOR_VERSION" -eq 4 -a "$PHPUNIT_MINOR_VERSION" -ge 4 \) ]; then
+ echo "phpunit version >= 4.4 required. Version found: $PHPUNIT_VERSION" >&2
exit 4
fi