From 68481c10e61b9db04f6a3627d270aff7e712bd25 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 19 May 2016 09:02:58 +0200 Subject: [PATCH] Fix namespaces in security/ --- .../{certificatemanager.php => CertificateManagerTest.php} | 2 ++ tests/lib/security/{certificate.php => CertificateTest.php} | 2 ++ .../{credentialsmanager.php => CredentialsManagerTest.php} | 2 ++ tests/lib/security/{crypto.php => CryptoTest.php} | 2 ++ tests/lib/security/{hasher.php => HasherTest.php} | 2 ++ tests/lib/security/{securerandom.php => SecureRandomTest.php} | 2 ++ .../{trusteddomainhelper.php => TrustedDomainHelperTest.php} | 2 ++ tests/lib/security/csp/ContentSecurityPolicyManagerTest.php | 3 +++ tests/lib/security/csrf/CsrfTokenGeneratorTest.php | 2 ++ tests/lib/security/csrf/CsrfTokenManagerTest.php | 2 ++ tests/lib/security/csrf/CsrfTokenTest.php | 2 ++ tests/lib/security/csrf/tokenstorage/SessionStorageTest.php | 2 ++ 12 files changed, 25 insertions(+) rename tests/lib/security/{certificatemanager.php => CertificateManagerTest.php} (99%) rename tests/lib/security/{certificate.php => CertificateTest.php} (99%) rename tests/lib/security/{credentialsmanager.php => CredentialsManagerTest.php} (99%) rename tests/lib/security/{crypto.php => CryptoTest.php} (99%) rename tests/lib/security/{hasher.php => HasherTest.php} (99%) rename tests/lib/security/{securerandom.php => SecureRandomTest.php} (98%) rename tests/lib/security/{trusteddomainhelper.php => TrustedDomainHelperTest.php} (98%) diff --git a/tests/lib/security/certificatemanager.php b/tests/lib/security/CertificateManagerTest.php similarity index 99% rename from tests/lib/security/certificatemanager.php rename to tests/lib/security/CertificateManagerTest.php index e9ccea39ef..43206569cf 100644 --- a/tests/lib/security/certificatemanager.php +++ b/tests/lib/security/CertificateManagerTest.php @@ -6,6 +6,8 @@ * See the COPYING-README file. */ +namespace Test\Security; + use \OC\Security\CertificateManager; /** diff --git a/tests/lib/security/certificate.php b/tests/lib/security/CertificateTest.php similarity index 99% rename from tests/lib/security/certificate.php rename to tests/lib/security/CertificateTest.php index 82e91c7173..888a4ba1f1 100644 --- a/tests/lib/security/certificate.php +++ b/tests/lib/security/CertificateTest.php @@ -19,6 +19,8 @@ * */ +namespace Test\Security; + use \OC\Security\Certificate; class CertificateTest extends \Test\TestCase { diff --git a/tests/lib/security/credentialsmanager.php b/tests/lib/security/CredentialsManagerTest.php similarity index 99% rename from tests/lib/security/credentialsmanager.php rename to tests/lib/security/CredentialsManagerTest.php index 72f061e05b..7eb4e4d7b1 100644 --- a/tests/lib/security/credentialsmanager.php +++ b/tests/lib/security/CredentialsManagerTest.php @@ -19,6 +19,8 @@ * */ +namespace Test\Security; + use \OCP\Security\ICrypto; use \OCP\IDBConnection; use \OC\Security\CredentialsManager; diff --git a/tests/lib/security/crypto.php b/tests/lib/security/CryptoTest.php similarity index 99% rename from tests/lib/security/crypto.php rename to tests/lib/security/CryptoTest.php index 1571cf8924..356d504f4b 100644 --- a/tests/lib/security/crypto.php +++ b/tests/lib/security/CryptoTest.php @@ -6,6 +6,8 @@ * See the COPYING-README file. */ +namespace Test\Security; + use \OC\Security\Crypto; class CryptoTest extends \Test\TestCase { diff --git a/tests/lib/security/hasher.php b/tests/lib/security/HasherTest.php similarity index 99% rename from tests/lib/security/hasher.php rename to tests/lib/security/HasherTest.php index a6f7df5b79..913f4d703e 100644 --- a/tests/lib/security/hasher.php +++ b/tests/lib/security/HasherTest.php @@ -6,6 +6,8 @@ * See the COPYING-README file. */ +namespace Test\Security; + use OC\Security\Hasher; /** diff --git a/tests/lib/security/securerandom.php b/tests/lib/security/SecureRandomTest.php similarity index 98% rename from tests/lib/security/securerandom.php rename to tests/lib/security/SecureRandomTest.php index 526066d92e..40431c8979 100644 --- a/tests/lib/security/securerandom.php +++ b/tests/lib/security/SecureRandomTest.php @@ -6,6 +6,8 @@ * See the COPYING-README file. */ +namespace Test\Security; + use \OC\Security\SecureRandom; class SecureRandomTest extends \Test\TestCase { diff --git a/tests/lib/security/trusteddomainhelper.php b/tests/lib/security/TrustedDomainHelperTest.php similarity index 98% rename from tests/lib/security/trusteddomainhelper.php rename to tests/lib/security/TrustedDomainHelperTest.php index 3581211ce6..dfd51167cc 100644 --- a/tests/lib/security/trusteddomainhelper.php +++ b/tests/lib/security/TrustedDomainHelperTest.php @@ -6,6 +6,8 @@ * See the COPYING-README file. */ +namespace Test\Security; + use \OC\Security\TrustedDomainHelper; use OCP\IConfig; diff --git a/tests/lib/security/csp/ContentSecurityPolicyManagerTest.php b/tests/lib/security/csp/ContentSecurityPolicyManagerTest.php index 975c35d378..d463e7c648 100644 --- a/tests/lib/security/csp/ContentSecurityPolicyManagerTest.php +++ b/tests/lib/security/csp/ContentSecurityPolicyManagerTest.php @@ -19,6 +19,9 @@ * */ +namespace Test\Security\CSP; + + use OC\Security\CSP\ContentSecurityPolicyManager; class ContentSecurityPolicyManagerTest extends \Test\TestCase { diff --git a/tests/lib/security/csrf/CsrfTokenGeneratorTest.php b/tests/lib/security/csrf/CsrfTokenGeneratorTest.php index be7434f514..28b85c3951 100644 --- a/tests/lib/security/csrf/CsrfTokenGeneratorTest.php +++ b/tests/lib/security/csrf/CsrfTokenGeneratorTest.php @@ -19,6 +19,8 @@ * */ +namespace Test\Security\CSRF; + class CsrfTokenGeneratorTest extends \Test\TestCase { /** @var \OCP\Security\ISecureRandom */ private $random; diff --git a/tests/lib/security/csrf/CsrfTokenManagerTest.php b/tests/lib/security/csrf/CsrfTokenManagerTest.php index 145fc03c51..ab19a43e91 100644 --- a/tests/lib/security/csrf/CsrfTokenManagerTest.php +++ b/tests/lib/security/csrf/CsrfTokenManagerTest.php @@ -19,6 +19,8 @@ * */ +namespace Test\Security\CSRF; + class CsrfTokenManagerTest extends \Test\TestCase { /** @var \OC\Security\CSRF\CsrfTokenManager */ private $csrfTokenManager; diff --git a/tests/lib/security/csrf/CsrfTokenTest.php b/tests/lib/security/csrf/CsrfTokenTest.php index 62e6ad112e..da640ce505 100644 --- a/tests/lib/security/csrf/CsrfTokenTest.php +++ b/tests/lib/security/csrf/CsrfTokenTest.php @@ -19,6 +19,8 @@ * */ +namespace Test\Security\CSRF; + class CsrfTokenTest extends \Test\TestCase { public function testGetEncryptedValue() { $csrfToken = new \OC\Security\CSRF\CsrfToken('MyCsrfToken'); diff --git a/tests/lib/security/csrf/tokenstorage/SessionStorageTest.php b/tests/lib/security/csrf/tokenstorage/SessionStorageTest.php index 3a83f6a8c0..550fa49e1b 100644 --- a/tests/lib/security/csrf/tokenstorage/SessionStorageTest.php +++ b/tests/lib/security/csrf/tokenstorage/SessionStorageTest.php @@ -19,6 +19,8 @@ * */ +namespace Test\Security\CSRF\TokenStorage; + class SessionStorageTest extends \Test\TestCase { /** @var \OCP\ISession */ private $session;