sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17792 from szepeviktor/master 

Fixing line comments and indentation, closes #17781
remotes/origin/handlebars-approach
Robin McCorkell 2015-07-22 10:21:41 +07:00
parent d37b8969f4 4699a29a70
commit 5768b3fe2c
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
apps/files_external/tests/backends/sftp_key.php
Unescape Escape View File

@ -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'));
}
}

6
apps/user_ldap/tests/wizard.php
Unescape Escape View File

@ -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));