Merge branch 'v0.11' into stablestable

1 files changed, 0 insertions, 59 deletions

diff --git a/tests/HttpUtils/GetIpAdressFromProxyTest.php b/tests/HttpUtils/GetIpAdressFromProxyTest.php
deleted file mode 100644
index 7af5bd9d..00000000
--- a/tests/HttpUtils/GetIpAdressFromProxyTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-require_once 'application/HttpUtils.php';
-
-/**
- * Unitary tests for getIpAddressFromProxy()
- */
-class GetIpAdressFromProxyTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Test without proxy
-     */
-    public function testWithoutProxy()
-    {
-        $this->assertFalse(getIpAddressFromProxy(array(), array()));
-    }
-
-    /**
-     * Test with a single IP in proxy header.
-     */
-    public function testWithOneForwardedIp()
-    {
-        $ip = '1.1.1.1';
-        $server = array('HTTP_X_FORWARDED_FOR' => $ip);
-        $this->assertEquals($ip, getIpAddressFromProxy($server, array()));
-    }
-
-    /**
-     * Test with a multiple IPs in proxy header.
-     */
-    public function testWithMultipleForwardedIp()
-    {
-        $ip = '1.1.1.1';
-        $ip2 = '2.2.2.2';
-
-        $server = array('HTTP_X_FORWARDED_FOR' => $ip .','. $ip2);
-        $this->assertEquals($ip2, getIpAddressFromProxy($server, array()));
-
-        $server = array('HTTP_X_FORWARDED_FOR' => $ip .' ,   '. $ip2);
-        $this->assertEquals($ip2, getIpAddressFromProxy($server, array()));
-    }
-
-    /**
-     * Test with a trusted IP address.
-     */
-    public function testWithTrustedIp()
-    {
-        $ip = '1.1.1.1';
-        $ip2 = '2.2.2.2';
-
-        $server = array('HTTP_X_FORWARDED_FOR' => $ip);
-        $this->assertFalse(getIpAddressFromProxy($server, array($ip)));
-
-        $server = array('HTTP_X_FORWARDED_FOR' => $ip .','. $ip2);
-        $this->assertEquals($ip2, getIpAddressFromProxy($server, array($ip)));
-        $this->assertFalse(getIpAddressFromProxy($server, array($ip, $ip2)));
-    }
-}