L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-61002-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE

Browse Source
This commit is contained in:
Damyon Wiese
2017-12-11 09:49:00 +08:00
parent b8067e0b01 e362c66d49
commit 28964ed251
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iplookup/tests/geoip_test.php
+11 -9
View File
@@ -31,14 +31,14 @@ defined('MOODLE_INTERNAL') || die();
*/
class core_iplookup_geoip_testcase extends advanced_testcase {
public function test_geoip() {
public function setUp() {
global $CFG;
require_once("$CFG->libdir/filelib.php");
require_once("$CFG->dirroot/iplookup/lib.php");
if (!PHPUNIT_LONGTEST) {
// this may take a long time
return;
$this->markTestSkipped('PHPUNIT_LONGTEST is not defined');
}
$this->resetAfterTest();
@@ -70,17 +70,19 @@ class core_iplookup_geoip_testcase extends advanced_testcase {
$this->assertTrue(file_exists($geoipfile));
$CFG->geoipfile = $geoipfile;
}
$result = iplookup_find_location('147.230.16.1');
public function test_ipv4() {
$result = iplookup_find_location('131.111.150.25');
$this->assertEquals('array', gettype($result));
$this->assertEquals('Liberec', $result['city']);
$this->assertEquals(15.0653, $result['longitude'], '', 0.001);
$this->assertEquals(50.7639, $result['latitude'], '', 0.001);
$this->assertEquals('Cambridge', $result['city']);
$this->assertEquals(0.1167, $result['longitude'], 'Coordinates are out of accepted tolerance', 0.01);
$this->assertEquals(52.2, $result['latitude'], 'Coordinates are out of accepted tolerance', 0.01);
$this->assertNull($result['error']);
$this->assertEquals('array', gettype($result['title']));
$this->assertEquals('Liberec', $result['title'][0]);
$this->assertEquals('Czech Republic', $result['title'][1]);
$this->assertEquals('Cambridge', $result['title'][0]);
$this->assertEquals('United Kingdom', $result['title'][1]);
}
}
iplookup/tests/geoplugin_test.php
+10 -9
View File
@@ -31,30 +31,31 @@ defined('MOODLE_INTERNAL') || die();
*/
class core_iplookup_geoplugin_testcase extends advanced_testcase {
public function test_geoip() {
public function setUp() {
global $CFG;
require_once("$CFG->libdir/filelib.php");
require_once("$CFG->dirroot/iplookup/lib.php");
if (!PHPUNIT_LONGTEST) {
// we do not want to DDOS their server, right?
return;
$this->markTestSkipped('PHPUNIT_LONGTEST is not defined');
}
$this->resetAfterTest();
$CFG->geoipfile = '';
}
$result = iplookup_find_location('147.230.16.1');
public function test_geoip_ipv4() {
$result = iplookup_find_location('131.111.150.25');
$this->assertEquals('array', gettype($result));
$this->assertEquals('Liberec', $result['city']);
$this->assertEquals(15.0653, $result['longitude'], '', 0.001);
$this->assertEquals(50.7639, $result['latitude'], '', 0.001);
$this->assertEquals('Cambridge', $result['city']);
$this->assertEquals(0.1167, $result['longitude'], '', 0.001);
$this->assertEquals(52.200000000000003, $result['latitude'], '', 0.001);
$this->assertNull($result['error']);
$this->assertEquals('array', gettype($result['title']));
$this->assertEquals('Liberec', $result['title'][0]);
$this->assertEquals('Czech Republic', $result['title'][1]);
$this->assertEquals('Cambridge', $result['title'][0]);
$this->assertEquals('United Kingdom', $result['title'][1]);
}
}