test: refactor test code

$expected is not expected values in some tests.

Author: kenjis

tests/system/HTTP/IncomingRequestTest.php

@@ -700,7 +700,8 @@ public function testGetIPAddressNormal()
     {
         $expected               = '123.123.123.123';
         $_SERVER['REMOTE_ADDR'] = $expected;
-        $this->request          = new Request(new App());
+
+        $this->request = new Request(new App());
         $this->request->populateHeaders();
 
         $this->assertSame($expected, $this->request->getIPAddress());
@@ -711,11 +712,12 @@ public function testGetIPAddressNormal()
     public function testGetIPAddressThruProxy()
     {
         $expected                        = '123.123.123.123';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
         $_SERVER['REMOTE_ADDR']          = '10.0.1.200';
         $config                          = new App();
         $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-        $this->request                   = new Request($config);
+
+        $this->request = new Request($config);
         $this->request->populateHeaders();
 
         // we should see the original forwarded address
@@ -724,40 +726,43 @@ public function testGetIPAddressThruProxy()
 
     public function testGetIPAddressThruProxyInvalid()
     {
-        $expected                        = '123.456.23.123';
-        $_SERVER['REMOTE_ADDR']          = '10.0.1.200';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '123.456.23.123';
+        $expected                        = '10.0.1.200';
+        $_SERVER['REMOTE_ADDR']          = $expected;
         $config                          = new App();
         $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-        $this->request                   = new Request($config);
+
+        $this->request = new Request($config);
         $this->request->populateHeaders();
 
         // spoofed address invalid
-        $this->assertSame('10.0.1.200', $this->request->getIPAddress());
+        $this->assertSame($expected, $this->request->getIPAddress());
     }
 
     public function testGetIPAddressThruProxyNotWhitelisted()
     {
-        $expected                        = '123.456.23.123';
-        $_SERVER['REMOTE_ADDR']          = '10.10.1.200';
+        $expected                        = '10.10.1.200';
+        $_SERVER['REMOTE_ADDR']          = $expected;
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '123.456.23.123';
         $config                          = new App();
         $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-        $this->request                   = new Request($config);
+
+        $this->request = new Request($config);
         $this->request->populateHeaders();
 
         // spoofed address invalid
-        $this->assertSame('10.10.1.200', $this->request->getIPAddress());
+        $this->assertSame($expected, $this->request->getIPAddress());
     }
 
     public function testGetIPAddressThruProxySubnet()
     {
         $expected                        = '123.123.123.123';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
         $_SERVER['REMOTE_ADDR']          = '192.168.5.21';
         $config                          = new App();
         $config->proxyIPs                = ['192.168.5.0/24'];
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-        $this->request                   = new Request($config);
+
+        $this->request = new Request($config);
         $this->request->populateHeaders();
 
         // we should see the original forwarded address
@@ -766,16 +771,16 @@ public function testGetIPAddressThruProxySubnet()
 
     public function testGetIPAddressThruProxyOutofSubnet()
     {
-        $expected                        = '123.123.123.123';
-        $_SERVER['REMOTE_ADDR']          = '192.168.5.21';
+        $expected                        = '192.168.5.21';
+        $_SERVER['REMOTE_ADDR']          = $expected;
         $config                          = new App();
         $config->proxyIPs                = ['192.168.5.0/28'];
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = '123.123.123.123';
         $this->request                   = new Request($config);
         $this->request->populateHeaders();
 
         // we should see the original forwarded address
-        $this->assertSame('192.168.5.21', $this->request->getIPAddress());
+        $this->assertSame($expected, $this->request->getIPAddress());
     }
 
     // @TODO getIPAddress should have more testing, to 100% code coverage