From ff6f865d420e9cad5a699226eb48a13981bed515 Mon Sep 17 00:00:00 2001
From: Walter Dal Mut <walter.dalmut@gmail.com>
Date: Wed, 10 Jun 2015 15:19:41 +0200
Subject: [PATCH] Test refactoring

Removed UDP/IP adapter construction (duplication)
---
 tests/ClientTest.php | 60 +++++++++++++++-----------------------------
 1 file changed, 20 insertions(+), 40 deletions(-)

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
index c3f24cb4e..f868a4cfc 100644
--- a/tests/ClientTest.php
+++ b/tests/ClientTest.php
@@ -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;
+    }
 }