odon
/
routeros-api-php
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

host, port, user, pass settings moved to phpunit.xml config

pull/8/head
Paul Rock 7 years ago
parent
efd9e83179
commit
ccee7ff2b7
4 changed files with 34 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      phpunit.xml
  2. 2
      tests/APIConnectorTest.php
  3. 50
      tests/ClientTest.php
  4. 2
      tests/Streams/ResourceStreamTest.php

7
phpunit.xml
View File

@ -16,4 +16,11 @@
<directory suffix=".php">./tests/</directory>
</testsuite>
</testsuites>
<php>
<env name="ROS_HOST" value="127.0.0.1"/>
<env name="ROS_USER" value="admin"/>
<env name="ROS_PASS" value="admin"/>
<env name="ROS_PORT_MODERN" value="18728"/>
<env name="ROS_PORT_LEGACY" value="28728"/>
</php>
</phpunit>

2
tests/APIConnectorTest.php
View File

@ -38,7 +38,7 @@ class APIConnectorTest extends TestCase
{
return [
[new ResourceStream(fopen(__FILE__, 'rb')),], // Myself, sure I exists
[new ResourceStream(fsockopen('tcp://127.0.0.1', 18728)),], // Socket
[new ResourceStream(fsockopen('tcp://' . getenv('ROS_HOST'), getenv('ROS_PORT_MODERN'))),], // Socket
[new ResourceStream(STDIN), false], // Try it, but do not close STDIN please !!!
[new StringStream('Hello World !!!')], // Try it, but do not close STDIN please !!!
[new StringStream('')], // Try it, but do not close STDIN please !!!

50
tests/ClientTest.php
View File

@ -16,7 +16,7 @@ class ClientTest extends TestCase
{
try {
$config = new Config();
$config->set('user', 'admin')->set('pass', 'admin')->set('host', '127.0.0.1');
$config->set('user', getenv('ROS_USER'))->set('pass', getenv('ROS_PASS'))->set('host', getenv('ROS_HOST'));
$obj = new Client($config);
$this->assertInternalType('object', $obj);
$socket = $obj->getSocket();
@ -30,9 +30,9 @@ class ClientTest extends TestCase
{
try {
$config = new Config([
'user' => 'admin',
'pass' => 'admin',
'host' => '127.0.0.1'
'user' => getenv('ROS_USER'),
'pass' => getenv('ROS_PASS'),
'host' => getenv('ROS_HOST')
]);
$obj = new Client($config);
$this->assertInternalType('object', $obj);
@ -47,9 +47,9 @@ class ClientTest extends TestCase
{
try {
$obj = new Client([
'user' => 'admin',
'pass' => 'admin',
'host' => '127.0.0.1'
'user' => getenv('ROS_USER'),
'pass' => getenv('ROS_PASS'),
'host' => getenv('ROS_HOST')
]);
$this->assertInternalType('object', $obj);
$socket = $obj->getSocket();
@ -64,8 +64,8 @@ class ClientTest extends TestCase
$this->expectException(ConfigException::class);
$obj = new Client([
'user' => 'admin',
'pass' => 'admin',
'user' => getenv('ROS_USER'),
'pass' => getenv('ROS_PASS'),
]);
}
@ -73,8 +73,8 @@ class ClientTest extends TestCase
{
try {
$config = new Config();
$config->set('user', 'admin')->set('pass', 'admin')
->set('host', '127.0.0.1')->set('port', 18728)->set('legacy', true);
$config->set('user', getenv('ROS_USER'))->set('pass', getenv('ROS_PASS'))
->set('host', getenv('ROS_HOST'))->set('port', (int) getenv('ROS_PORT_MODERN'))->set('legacy', true);
$obj = new Client($config);
$this->assertInternalType('object', $obj);
} catch (\Exception $e) {
@ -84,15 +84,15 @@ class ClientTest extends TestCase
/**
* Test non legacy connection on legacy router (pre 6.43)
*
*
* login() method recognise legacy router response and swap to legacy mode
*/
*/
public function test__constructLegacy2()
{
try {
$config = new Config();
$config->set('user', 'admin')->set('pass', 'admin')
->set('host', '127.0.0.1')->set('port', 18728)->set('legacy', false);
$config->set('user', getenv('ROS_USER'))->set('pass', getenv('ROS_PASS'))
->set('host', getenv('ROS_HOST'))->set('port', (int) getenv('ROS_PORT_MODERN'))->set('legacy', false);
$obj = new Client($config);
$this->assertInternalType('object', $obj);
} catch (\Exception $e) {
@ -106,7 +106,7 @@ class ClientTest extends TestCase
$this->expectException(ClientException::class);
$config = (new Config())->set('attempts', 2);
$config->set('user', 'admin')->set('pass', 'admin2')->set('host', '127.0.0.1');
$config->set('user', getenv('ROS_USER'))->set('pass', 'admin2')->set('host', getenv('ROS_HOST'));
$obj = new Client($config);
}
@ -118,14 +118,14 @@ class ClientTest extends TestCase
$this->expectException(ClientException::class);
$config = new Config();
$config->set('user', 'admin')->set('pass', 'admin')->set('host', '127.0.0.1')->set('port', 11111);
$config->set('user', getenv('ROS_USER'))->set('pass', getenv('ROS_PASS'))->set('host', getenv('ROS_HOST'))->set('port', 11111);
$obj = new Client($config);
}
public function testWriteRead()
{
$config = new Config();
$config->set('user', 'admin')->set('pass', 'admin')->set('host', '127.0.0.1');
$config->set('user', getenv('ROS_USER'))->set('pass', getenv('ROS_PASS'))->set('host', getenv('ROS_HOST'));
$obj = new Client($config);
$query = new Query('/ip/address/print');
@ -157,7 +157,7 @@ class ClientTest extends TestCase
public function testWriteReadString()
{
$config = new Config();
$config->set('user', 'admin')->set('pass', 'admin')->set('host', '127.0.0.1');
$config->set('user', getenv('ROS_USER'))->set('pass', getenv('ROS_PASS'))->set('host', getenv('ROS_HOST'));
$obj = new Client($config);
$readTrap = $obj->wr('/interface', false);
@ -168,7 +168,7 @@ class ClientTest extends TestCase
public function testWriteReadArray()
{
$config = new Config();
$config->set('user', 'admin')->set('pass', 'admin')->set('host', '127.0.0.1');
$config->set('user', getenv('ROS_USER'))->set('pass', getenv('ROS_PASS'))->set('host', getenv('ROS_HOST'));
$obj = new Client($config);
$readTrap = $obj->wr(['/interface'], false);
@ -179,7 +179,7 @@ class ClientTest extends TestCase
public function testFatal()
{
$config = new Config();
$config->set('user', 'admin')->set('pass', 'admin')->set('host', '127.0.0.1');
$config->set('user', getenv('ROS_USER'))->set('pass', getenv('ROS_PASS'))->set('host', getenv('ROS_HOST'));
$obj = new Client($config);
$readTrap = $obj->wr('/quit');
@ -192,7 +192,7 @@ class ClientTest extends TestCase
$this->expectException(QueryException::class);
$config = new Config();
$config->set('user', 'admin')->set('pass', 'admin')->set('host', '127.0.0.1');
$config->set('user', getenv('ROS_USER'))->set('pass', getenv('ROS_PASS'))->set('host', getenv('ROS_HOST'));
$obj = new Client($config);
$error = $obj->write($obj)->read(false);
}
@ -200,9 +200,9 @@ class ClientTest extends TestCase
public function testGetConfig()
{
$obj = new Client([
'user' => 'admin',
'pass' => 'admin',
'host' => '127.0.0.1'
'user' => getenv('ROS_USER'),
'pass' => getenv('ROS_PASS'),
'host' => getenv('ROS_HOST')
]);
$config = $obj->getConfig();

2
tests/Streams/ResourceStreamTest.php
View File

@ -77,7 +77,7 @@ class ResourceStreamTest extends TestCase
{
return [
[fopen(__FILE__, 'rb'),], // Myself, sure I exists
[fsockopen('tcp://127.0.0.1', 18728),], // Socket
[fsockopen('tcp://127.0.0.1', getenv('ROS_PORT_MODERN')),], // Socket
[STDIN, false], // Try it, but do not close STDIN please !!!
// What else ?
];

Write Preview
Loading…
Cancel
Save