From 3b7ba552ae6fb3aada32ec024138227007fd1f13 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Tue, 24 May 2016 16:17:15 +0200 Subject: [PATCH 1/2] Fix ext storage test class name in test script --- autotest-external.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/autotest-external.sh b/autotest-external.sh index 9705980aa2b..9d9d42cee35 100755 --- a/autotest-external.sh +++ b/autotest-external.sh @@ -178,7 +178,7 @@ EOF return; fi - FILES_EXTERNAL_BACKEND_PATH=../apps/files_external/tests/storage + FILES_EXTERNAL_BACKEND_PATH=../apps/files_external/tests/Storage FILES_EXTERNAL_BACKEND_ENV_PATH=../apps/files_external/tests/env for startFile in `ls -1 $FILES_EXTERNAL_BACKEND_ENV_PATH | grep start`; do @@ -198,7 +198,9 @@ EOF # getting backend to test from filename # it's the part between the dots startSomething.TestToRun.sh testToRun=`echo $startFile | cut -d '-' -f 2` - testToRun="${testToRun}test.php" + # capitalize first letter + testToRun="${testToRun^}" + testToRun="${testToRun}Test.php" # run the specific test if [ -z "$NOCOVERAGE" ]; then From 9382cd1d8e135d77f316bbc8ab3fbea76e84708a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 24 May 2016 16:37:06 +0200 Subject: [PATCH 2/2] Fix the names of the tests so the script discovers them again --- .../tests/Storage/{AmazonS3Test.php => Amazons3Test.php} | 4 ++-- .../files_external/tests/Storage/{FTPTest.php => FtpTest.php} | 4 ++-- .../tests/Storage/{OwnCloudTest.php => OwncloudTest.php} | 2 +- .../tests/Storage/{SFTPTest.php => SftpTest.php} | 4 ++-- .../files_external/tests/Storage/{SMBTest.php => SmbTest.php} | 4 ++-- .../tests/Storage/{WebDAVTest.php => WebdavTest.php} | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) rename apps/files_external/tests/Storage/{AmazonS3Test.php => Amazons3Test.php} (95%) rename apps/files_external/tests/Storage/{FTPTest.php => FtpTest.php} (97%) rename apps/files_external/tests/Storage/{OwnCloudTest.php => OwncloudTest.php} (96%) rename apps/files_external/tests/Storage/{SFTPTest.php => SftpTest.php} (98%) rename apps/files_external/tests/Storage/{SMBTest.php => SmbTest.php} (97%) rename apps/files_external/tests/Storage/{WebDAVTest.php => WebdavTest.php} (95%) diff --git a/apps/files_external/tests/Storage/AmazonS3Test.php b/apps/files_external/tests/Storage/Amazons3Test.php similarity index 95% rename from apps/files_external/tests/Storage/AmazonS3Test.php rename to apps/files_external/tests/Storage/Amazons3Test.php index eb0e410764c..2776f929a4e 100644 --- a/apps/files_external/tests/Storage/AmazonS3Test.php +++ b/apps/files_external/tests/Storage/Amazons3Test.php @@ -29,13 +29,13 @@ namespace OCA\Files_External\Tests\Storage; use \OCA\Files_External\Lib\Storage\AmazonS3; /** - * Class AmazonS3Test + * Class Amazons3Test * * @group DB * * @package OCA\Files_External\Tests\Storage */ -class AmazonS3Test extends \Test\Files\Storage\Storage { +class Amazons3Test extends \Test\Files\Storage\Storage { private $config; diff --git a/apps/files_external/tests/Storage/FTPTest.php b/apps/files_external/tests/Storage/FtpTest.php similarity index 97% rename from apps/files_external/tests/Storage/FTPTest.php rename to apps/files_external/tests/Storage/FtpTest.php index 9af9ccff012..941457fc662 100644 --- a/apps/files_external/tests/Storage/FTPTest.php +++ b/apps/files_external/tests/Storage/FtpTest.php @@ -29,13 +29,13 @@ namespace OCA\Files_External\Tests\Storage; use \OCA\Files_External\Lib\Storage\FTP; /** - * Class FTPTest + * Class FtpTest * * @group DB * * @package OCA\Files_External\Tests\Storage */ -class FTPTest extends \Test\Files\Storage\Storage { +class FtpTest extends \Test\Files\Storage\Storage { private $config; protected function setUp() { diff --git a/apps/files_external/tests/Storage/OwnCloudTest.php b/apps/files_external/tests/Storage/OwncloudTest.php similarity index 96% rename from apps/files_external/tests/Storage/OwnCloudTest.php rename to apps/files_external/tests/Storage/OwncloudTest.php index cbc25e46fa0..e48c1ea7a51 100644 --- a/apps/files_external/tests/Storage/OwnCloudTest.php +++ b/apps/files_external/tests/Storage/OwncloudTest.php @@ -33,7 +33,7 @@ use \OCA\Files_External\Lib\Storage\OwnCloud; * * @package OCA\Files_External\Tests\Storage */ -class OwnCloudTest extends \Test\Files\Storage\Storage { +class OwncloudTest extends \Test\Files\Storage\Storage { private $config; diff --git a/apps/files_external/tests/Storage/SFTPTest.php b/apps/files_external/tests/Storage/SftpTest.php similarity index 98% rename from apps/files_external/tests/Storage/SFTPTest.php rename to apps/files_external/tests/Storage/SftpTest.php index 329e93819fc..1d55366840a 100644 --- a/apps/files_external/tests/Storage/SFTPTest.php +++ b/apps/files_external/tests/Storage/SftpTest.php @@ -29,13 +29,13 @@ namespace OCA\Files_External\Tests\Storage; use \OCA\Files_External\Lib\Storage\SFTP; /** - * Class SFTPTest + * Class SftpTest * * @group DB * * @package OCA\Files_External\Tests\Storage */ -class SFTPTest extends \Test\Files\Storage\Storage { +class SftpTest extends \Test\Files\Storage\Storage { /** * @var SFTP instance */ diff --git a/apps/files_external/tests/Storage/SMBTest.php b/apps/files_external/tests/Storage/SmbTest.php similarity index 97% rename from apps/files_external/tests/Storage/SMBTest.php rename to apps/files_external/tests/Storage/SmbTest.php index fc2795702c6..3d217a5575a 100644 --- a/apps/files_external/tests/Storage/SMBTest.php +++ b/apps/files_external/tests/Storage/SmbTest.php @@ -28,13 +28,13 @@ namespace OCA\Files_External\Tests\Storage; use \OCA\Files_External\Lib\Storage\SMB; /** - * Class SMBTest + * Class SmbTest * * @group DB * * @package OCA\Files_External\Tests\Storage */ -class SMBTest extends \Test\Files\Storage\Storage { +class SmbTest extends \Test\Files\Storage\Storage { protected function setUp() { parent::setUp(); diff --git a/apps/files_external/tests/Storage/WebDAVTest.php b/apps/files_external/tests/Storage/WebdavTest.php similarity index 95% rename from apps/files_external/tests/Storage/WebDAVTest.php rename to apps/files_external/tests/Storage/WebdavTest.php index f8c5b19e04f..fbb4e8ae5f6 100644 --- a/apps/files_external/tests/Storage/WebDAVTest.php +++ b/apps/files_external/tests/Storage/WebdavTest.php @@ -28,13 +28,13 @@ namespace OCA\Files_External\Tests\Storage; use \OC\Files\Storage\DAV; /** - * Class WebDAVTest + * Class WebdavTest * * @group DB * * @package OCA\Files_External\Tests\Storage */ -class WebDAVTest extends \Test\Files\Storage\Storage { +class WebdavTest extends \Test\Files\Storage\Storage { protected function setUp() { parent::setUp();