mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-12 03:52:16 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-61169-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
David Monllao 2018-01-08 14:58:31 +01:00
commit 22a9fed6b2
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
iplookup/tests/geoip_test.php
View File

@ -81,17 +81,16 @@ class core_iplookup_geoip_testcase extends advanced_testcase {
}
public function test_ipv4() {
$result = iplookup_find_location('131.111.150.25');
$result = iplookup_find_location('192.30.255.112');
$this->assertEquals('array', gettype($result));
$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->assertEquals('San Francisco', $result['city']);
$this->assertEquals(-122.3933, $result['longitude'], 'Coordinates are out of accepted tolerance', 0.01);
$this->assertEquals(37.7697, $result['latitude'], 'Coordinates are out of accepted tolerance', 0.01);
$this->assertNull($result['error']);
$this->assertEquals('array', gettype($result['title']));
$this->assertEquals('Cambridge', $result['title'][0]);
$this->assertEquals('United Kingdom', $result['title'][1]);
$this->assertEquals('San Francisco', $result['title'][0]);
$this->assertEquals('United States', $result['title'][1]);
}
public function test_ipv6() {
@ -110,4 +109,3 @@ class core_iplookup_geoip_testcase extends advanced_testcase {
$this->assertEquals('United States', $result['title'][1]);
}
}

14
iplookup/tests/geoplugin_test.php
View File

@ -46,17 +46,17 @@ class core_iplookup_geoplugin_testcase extends advanced_testcase {
$CFG->geoipfile = '';
}
public function test_geoip_ipv4() {
$result = iplookup_find_location('131.111.150.25');
public function test_ipv4() {
$result = iplookup_find_location('192.30.255.112');
$this->assertEquals('array', gettype($result));
$this->assertEquals('Cambridge', $result['city']);
$this->assertEquals(0.1167, $result['longitude'], '', 0.001);
$this->assertEquals(52.200000000000003, $result['latitude'], '', 0.001);
$this->assertEquals('San Francisco', $result['city']);
$this->assertEquals(-122.3933, $result['longitude'], 'Coordinates are out of accepted tolerance', 0.01);
$this->assertEquals(37.7697, $result['latitude'], 'Coordinates are out of accepted tolerance', 0.01);
$this->assertNull($result['error']);
$this->assertEquals('array', gettype($result['title']));
$this->assertEquals('Cambridge', $result['title'][0]);
$this->assertEquals('United Kingdom', $result['title'][1]);
$this->assertEquals('San Francisco', $result['title'][0]);
$this->assertEquals('United States', $result['title'][1]);
}
public function test_geoip_ipv6() {