Fix#3

src/GameQ/Protocols/Blackmesa.php

@@ -39,11 +39,4 @@ class Blackmesa extends Source
      * @type string
      */
     protected $name_long = "Black Mesa";
-
-    /**
-     * query_port = client_port + 1
-     *
-     * @type int
-     * protected $port_diff = 1;
-     */
 }

src/GameQ/Protocols/Citadel.php

@@ -39,11 +39,4 @@ class Citadel extends Source
      * @type string
      */
     protected $name_long = "Citadel";
-
-    /**
-     * query_port = client_port + 1
-     *
-     * @type int
-     * protected $port_diff = 1;
-     */
 }

tests/Protocols/Barotrauma.php

@@ -16,33 +16,34 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GameQ\Protocols;
+namespace GameQ\Tests\Protocols;
 
 /**
- * Barotrauma Protocol Class
+ * Test Class for Barotrauma
  *
- * @package GameQ\Protocols
+ * @package GameQ\Tests\Protocols
  */
-class Barotrauma extends Source
+class Barotrauma extends Base
 {
     /**
-     * String name of this protocol class
+     * Test responses for Barotrauma
      *
-     * @type string
-     */
-    protected $name = 'barotrauma';
-
-    /**
-     * Longer string name of this protocol class
+     * @dataProvider loadData
      *
-     * @type string
+     * @param $responses
+     * @param $result
      */
-    protected $name_long = "Barotrauma";
+    public function testResponses($responses, $result)
+    {
+        // Pull the first key off the array this is the server ip:port
+        $server = key($result);
 
-    /**
-     * query_port = client_port + 1
-     *
-     * @type int
-     */
-    protected $port_diff = 1;
+        $testResult = $this->queryTest(
+            $server,
+            'barotrauma',
+            $responses
+        );
+
+        $this->assertEquals($result[$server], $testResult);
+    }
 }

tests/Protocols/Blackmesa.php

@@ -16,33 +16,34 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GameQ\Protocols;
+namespace GameQ\Tests\Protocols;
 
 /**
- * Blackmesa Protocol Class
+ * Test Class for Blackmesa
  *
- * @package GameQ\Protocols
+ * @package GameQ\Tests\Protocols
  */
-class Blackmesa extends Source
+class Blackmesa extends Base
 {
     /**
-     * String name of this protocol class
+     * Test responses for Blackmesa
      *
-     * @type string
-     */
-    protected $name = 'blackmesa';
-
-    /**
-     * Longer string name of this protocol class
+     * @dataProvider loadData
      *
-     * @type string
+     * @param $responses
+     * @param $result
      */
-    protected $name_long = "Black Mesa";
+    public function testResponses($responses, $result)
+    {
+        // Pull the first key off the array this is the server ip:port
+        $server = key($result);
 
-    /**
-     * query_port = client_port + 1
-     *
-     * @type int
-     * protected $port_diff = 1;
-     */
+        $testResult = $this->queryTest(
+            $server,
+            'blackmesa',
+            $responses
+        );
+
+        $this->assertEquals($result[$server], $testResult);
+    }
 }

tests/Protocols/Citadel.php

@@ -16,33 +16,34 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-namespace GameQ\Protocols;
+namespace GameQ\Tests\Protocols;
 
 /**
- * Citadel Protocol Class
+ * Test Class for Citadel
  *
- * @package GameQ\Protocols
+ * @package GameQ\Tests\Protocols
  */
-class Citadel extends Source
+class Citadel extends Base
 {
     /**
-     * String name of this protocol class
+     * Test responses for Citadel
      *
-     * @type string
-     */
-    protected $name = 'citadel';
-
-    /**
-     * Longer string name of this protocol class
+     * @dataProvider loadData
      *
-     * @type string
+     * @param $responses
+     * @param $result
      */
-    protected $name_long = "Citadel";
+    public function testResponses($responses, $result)
+    {
+        // Pull the first key off the array this is the server ip:port
+        $server = key($result);
 
-    /**
-     * query_port = client_port + 1
-     *
-     * @type int
-     * protected $port_diff = 1;
-     */
+        $testResult = $this->queryTest(
+            $server,
+            'citadel',
+            $responses
+        );
+
+        $this->assertEquals($result[$server], $testResult);
+    }
 }

tests/Protocols/Fof.php

@@ -35,10 +35,6 @@ class Fof extends Base
      */
     public function testResponses($responses, $result)
     {
-        \GameQ\Tests\MockDNS::mockHosts([
-            'g-one.org' => '164.132.202.2:27024'
-        ]);
-
         // Pull the first key off the array this is the server ip:port
         $server = key($result);
 

tests/Protocols/Hl1.php

@@ -35,10 +35,6 @@ class Hl1 extends Base
      */
     public function testResponses($responses, $result)
     {
-        \GameQ\Tests\MockDNS::mockHosts([
-            'g-one.org' => '46.174.52.4:27222'
-        ]);
-
         // Pull the first key off the array this is the server ip:port
         $server = key($result);
 

tests/Protocols/Modiverse.php

@@ -35,10 +35,6 @@ class Modiverse extends Base
      */
     public function testResponses($responses, $result)
     {
-        \GameQ\Tests\MockDNS::mockHosts([
-            'g-one.org' => '23.88.96.146:27016'
-        ]);
-
         // Pull the first key off the array this is the server ip:port
         $server = key($result);
 

tests/Protocols/Nmrih.php

@@ -35,10 +35,6 @@ class Nmrih extends Base
      */
     public function testResponses($responses, $result)
     {
-        \GameQ\Tests\MockDNS::mockHosts([
-            'g-one.org' => '176.9.10.34:27055'
-        ]);
-
         // Pull the first key off the array this is the server ip:port
         $server = key($result);
 

tests/Protocols/Of.php

@@ -35,10 +35,6 @@ class Of extends Base
      */
     public function testResponses($responses, $result)
     {
-        \GameQ\Tests\MockDNS::mockHosts([
-            'g-one.org' => '74.91.127.161:27015'
-        ]);
-
         // Pull the first key off the array this is the server ip:port
         $server = key($result);
 

tests/Protocols/Sco.php

@@ -35,10 +35,6 @@ class Sco extends Base
      */
     public function testResponses($responses, $result)
     {
-        \GameQ\Tests\MockDNS::mockHosts([
-            'g-one.org' => '176.9.61.5:27027'
-        ]);
-
         // Pull the first key off the array this is the server ip:port
         $server = key($result);
 

tests/Protocols/Stormworks.php

@@ -35,10 +35,6 @@ class Stormworks extends Base
      */
     public function testResponses($responses, $result)
     {
-        \GameQ\Tests\MockDNS::mockHosts([
-            'g-one.org' => '23.88.96.146:28015'
-        ]);
-
         // Pull the first key off the array this is the server ip:port
         $server = key($result);