Fixing line comments and indentation

This commit is contained in:
Viktor Szépe 2015-07-21 22:19:53 +02:00
parent 2d691c2fb4
commit 4699a29a70
2 changed files with 25 additions and 24 deletions

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']) { 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->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 = new \OC\Files\Storage\SFTP_Key($this->config['sftp_key']);
$this->instance->mkdir('/'); $this->instance->mkdir('/');
} }
@ -47,16 +48,16 @@ class SFTP_Key extends Storage {
} }
/** /**
* @expectedException InvalidArgumentException * @expectedException InvalidArgumentException
*/ */
public function testInvalidAddressShouldThrowException() { public function testInvalidAddressShouldThrowException() {
# I'd use example.com for this, but someone decided to break the spec and make it resolve // I'd use example.com for this, but someone decided to break the spec and make it resolve
$this->instance->assertHostAddressValid('notarealaddress...'); $this->instance->assertHostAddressValid('notarealaddress...');
} }
public function testValidAddressShouldPass() { public function testValidAddressShouldPass() {
$this->assertTrue($this->instance->assertHostAddressValid('localhost')); $this->assertTrue($this->instance->assertHostAddressValid('localhost'));
} }
/** /**
* @expectedException InvalidArgumentException * @expectedException InvalidArgumentException
@ -66,20 +67,20 @@ class SFTP_Key extends Storage {
} }
/** /**
* @expectedException InvalidArgumentException * @expectedException InvalidArgumentException
*/ */
public function testNonNumericalPortNumberShouldThrowException() { public function testNonNumericalPortNumberShouldThrowException() {
$this->instance->assertPortNumberValid('a'); $this->instance->assertPortNumberValid('a');
} }
/** /**
* @expectedException InvalidArgumentException * @expectedException InvalidArgumentException
*/ */
public function testHighPortNumberShouldThrowException() { public function testHighPortNumberShouldThrowException() {
$this->instance->assertPortNumberValid('65536'); $this->instance->assertPortNumberValid('65536');
} }
public function testValidPortNumberShouldPass() { public function testValidPortNumberShouldPass() {
$this->assertTrue($this->instance->assertPortNumberValid('22222')); $this->assertTrue($this->instance->assertPortNumberValid('22222'));
} }
} }

View File

@ -140,7 +140,7 @@ class Test_Wizard extends \Test\TestCase {
return $uidnumber++; return $uidnumber++;
})); }));
# The following expectations are the real test # // The following expectations are the real test
$filters = array('f1', 'f2', '*'); $filters = array('f1', 'f2', '*');
$wizard->cumulativeSearchOnAttribute($filters, 'cn', 5); $wizard->cumulativeSearchOnAttribute($filters, 'cn', 5);
unset($uidnumber); unset($uidnumber);
@ -216,7 +216,7 @@ class Test_Wizard extends \Test\TestCase {
return $uidnumber++; return $uidnumber++;
})); }));
# The following expectations are the real test # // The following expectations are the real test
$filters = array('f1', 'f2', '*'); $filters = array('f1', 'f2', '*');
$wizard->cumulativeSearchOnAttribute($filters, 'cn', 0); $wizard->cumulativeSearchOnAttribute($filters, 'cn', 0);
unset($uidnumber); unset($uidnumber);
@ -431,7 +431,7 @@ class Test_Wizard extends \Test\TestCase {
return $b; return $b;
})); }));
# The following expectations are the real test # // The following expectations are the real test
$filters = array('f1', 'f2', '*'); $filters = array('f1', 'f2', '*');
$resultArray = $wizard->cumulativeSearchOnAttribute($filters, 'cn', 0); $resultArray = $wizard->cumulativeSearchOnAttribute($filters, 'cn', 0);
$this->assertSame(6, count($resultArray)); $this->assertSame(6, count($resultArray));