Test refactoring

Removed UDP/IP adapter construction (duplication)
This commit is contained in:
Walter Dal Mut
2015-06-10 15:54:07 +02:00
parent 38f65a75fd
commit ff6f865d42
+20 -40
View File
@@ -161,16 +161,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase
*/
public function testUdpIpWriteData()
{
$rawOptions = $this->rawOptions;
$options = new Options();
$options->setHost($rawOptions["udp"]["host"]);
$options->setUsername($rawOptions["udp"]["username"]);
$options->setPassword($rawOptions["udp"]["password"]);
$options->setPort($rawOptions["udp"]["port"]);
$options->setDatabase($rawOptions["udp"]["database"]);
$adapter = new UdpAdapter($options);
$object = new Client($adapter);
$object = $this->createClientWithUdpAdapter();
$object->mark("udp.test", ["mark" => "element"]);
sleep(1);
@@ -194,16 +185,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase
*/
public function testSendMultipleMeasurementWithUdpIp()
{
$rawOptions = $this->rawOptions;
$options = new Options();
$options->setHost($rawOptions["udp"]["host"]);
$options->setUsername($rawOptions["udp"]["username"]);
$options->setPassword($rawOptions["udp"]["password"]);
$options->setPort($rawOptions["udp"]["port"]);
$options->setDatabase($rawOptions["udp"]["database"]);
$adapter = new UdpAdapter($options);
$object = new Client($adapter);
$object = $this->createClientWithUdpAdapter();
$object->mark([
"points" => [
@@ -243,16 +225,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase
*/
public function testWriteDirectMessageWithUdpIp()
{
$rawOptions = $this->rawOptions;
$options = new Options();
$options->setHost($rawOptions["udp"]["host"]);
$options->setUsername($rawOptions["udp"]["username"]);
$options->setPassword($rawOptions["udp"]["password"]);
$options->setPort($rawOptions["udp"]["port"]);
$options->setDatabase($rawOptions["udp"]["database"]);
$adapter = new UdpAdapter($options);
$object = new Client($adapter);
$object = $this->createClientWithUdpAdapter();
$object->mark([
"points" => [
@@ -283,16 +256,7 @@ class ClientTest extends \PHPUnit_Framework_TestCase
*/
public function testTagsAreWrittenCorrectly()
{
$rawOptions = $this->rawOptions;
$options = new Options();
$options->setHost($rawOptions["udp"]["host"]);
$options->setUsername($rawOptions["udp"]["username"]);
$options->setPassword($rawOptions["udp"]["password"]);
$options->setPort($rawOptions["udp"]["port"]);
$options->setDatabase($rawOptions["udp"]["database"]);
$adapter = new UdpAdapter($options);
$object = new Client($adapter);
$object = $this->createClientWithUdpAdapter();
$object->mark([
"tags" => [
@@ -353,4 +317,20 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$this->object->deleteDatabase("walter");
}
private function createClientWithUdpAdapter()
{
$rawOptions = $this->rawOptions;
$options = new Options();
$options->setHost($rawOptions["udp"]["host"]);
$options->setUsername($rawOptions["udp"]["username"]);
$options->setPassword($rawOptions["udp"]["password"]);
$options->setPort($rawOptions["udp"]["port"]);
$options->setDatabase($rawOptions["udp"]["database"]);
$adapter = new UdpAdapter($options);
$object = new Client($adapter);
return $object;
}
}