diff --git a/phpunit.xml b/phpunit.xml
index 1c4a840..644e542 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -16,4 +16,11 @@
./tests/
+
+
+
+
+
+
+
diff --git a/tests/APIConnectorTest.php b/tests/APIConnectorTest.php
index 72c0c43..b4784fe 100644
--- a/tests/APIConnectorTest.php
+++ b/tests/APIConnectorTest.php
@@ -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 !!!
diff --git a/tests/ClientTest.php b/tests/ClientTest.php
index a899a5d..3203b23 100644
--- a/tests/ClientTest.php
+++ b/tests/ClientTest.php
@@ -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();
diff --git a/tests/Streams/ResourceStreamTest.php b/tests/Streams/ResourceStreamTest.php
index d2c466a..3fdc70a 100644
--- a/tests/Streams/ResourceStreamTest.php
+++ b/tests/Streams/ResourceStreamTest.php
@@ -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 ?
];