diff options
author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2015-07-22 10:21:41 +0100 |
---|---|---|
committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2015-07-22 10:21:41 +0100 |
commit | 5768b3fe2c328b81d9c0aa9eec07846a391d212d (patch) | |
tree | 95ad0ad5f1ee166d300aa8bfcb0a0a42b5e0105c | |
parent | d37b8969f462a1c4c626a77584bb43929d659113 (diff) | |
parent | 4699a29a705d02493038315b2b6f0d78efa97c95 (diff) | |
download | nextcloud-server-5768b3fe2c328b81d9c0aa9eec07846a391d212d.tar.gz nextcloud-server-5768b3fe2c328b81d9c0aa9eec07846a391d212d.zip |
Merge pull request #17792 from szepeviktor/master
Fixing line comments and indentation, closes #17781
-rw-r--r-- | apps/files_external/tests/backends/sftp_key.php | 43 | ||||
-rw-r--r-- | apps/user_ldap/tests/wizard.php | 6 |
2 files changed, 25 insertions, 24 deletions
diff --git a/apps/files_external/tests/backends/sftp_key.php b/apps/files_external/tests/backends/sftp_key.php index 7936c9addce..c83d12251aa 100644 --- a/apps/files_external/tests/backends/sftp_key.php +++ b/apps/files_external/tests/backends/sftp_key.php @@ -33,7 +33,8 @@ class SFTP_Key extends Storage { if ( ! is_array($this->config) or ! isset($this->config['sftp_key']) or ! $this->config['sftp_key']['run']) { $this->markTestSkipped('SFTP with key backend not configured'); } - $this->config['sftp_key']['root'] .= '/' . $id; //make sure we have an new empty folder to work in + // Make sure we have an new empty folder to work in + $this->config['sftp_key']['root'] .= '/' . $id; $this->instance = new \OC\Files\Storage\SFTP_Key($this->config['sftp_key']); $this->instance->mkdir('/'); } @@ -47,16 +48,16 @@ class SFTP_Key extends Storage { } /** - * @expectedException InvalidArgumentException - */ - public function testInvalidAddressShouldThrowException() { - # I'd use example.com for this, but someone decided to break the spec and make it resolve - $this->instance->assertHostAddressValid('notarealaddress...'); - } + * @expectedException InvalidArgumentException + */ + public function testInvalidAddressShouldThrowException() { + // I'd use example.com for this, but someone decided to break the spec and make it resolve + $this->instance->assertHostAddressValid('notarealaddress...'); + } public function testValidAddressShouldPass() { - $this->assertTrue($this->instance->assertHostAddressValid('localhost')); - } + $this->assertTrue($this->instance->assertHostAddressValid('localhost')); + } /** * @expectedException InvalidArgumentException @@ -66,20 +67,20 @@ class SFTP_Key extends Storage { } /** - * @expectedException InvalidArgumentException - */ - public function testNonNumericalPortNumberShouldThrowException() { - $this->instance->assertPortNumberValid('a'); - } + * @expectedException InvalidArgumentException + */ + public function testNonNumericalPortNumberShouldThrowException() { + $this->instance->assertPortNumberValid('a'); + } /** - * @expectedException InvalidArgumentException - */ - public function testHighPortNumberShouldThrowException() { - $this->instance->assertPortNumberValid('65536'); - } + * @expectedException InvalidArgumentException + */ + public function testHighPortNumberShouldThrowException() { + $this->instance->assertPortNumberValid('65536'); + } public function testValidPortNumberShouldPass() { - $this->assertTrue($this->instance->assertPortNumberValid('22222')); - } + $this->assertTrue($this->instance->assertPortNumberValid('22222')); + } } diff --git a/apps/user_ldap/tests/wizard.php b/apps/user_ldap/tests/wizard.php index f8e14f08bc9..525364390bc 100644 --- a/apps/user_ldap/tests/wizard.php +++ b/apps/user_ldap/tests/wizard.php @@ -140,7 +140,7 @@ class Test_Wizard extends \Test\TestCase { return $uidnumber++; })); - # The following expectations are the real test # + // The following expectations are the real test $filters = array('f1', 'f2', '*'); $wizard->cumulativeSearchOnAttribute($filters, 'cn', 5); unset($uidnumber); @@ -216,7 +216,7 @@ class Test_Wizard extends \Test\TestCase { return $uidnumber++; })); - # The following expectations are the real test # + // The following expectations are the real test $filters = array('f1', 'f2', '*'); $wizard->cumulativeSearchOnAttribute($filters, 'cn', 0); unset($uidnumber); @@ -431,7 +431,7 @@ class Test_Wizard extends \Test\TestCase { return $b; })); - # The following expectations are the real test # + // The following expectations are the real test $filters = array('f1', 'f2', '*'); $resultArray = $wizard->cumulativeSearchOnAttribute($filters, 'cn', 0); $this->assertSame(6, count($resultArray)); |