Refactor AttributeHistoricalDataWithLocations for clarity, fixing IntegrationTestCase issue and fixing changes to RawLog...

2 files changed, 2 insertions, 2 deletions

diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
index 3abb1ee414..f460758fbc 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
@@ -192,7 +192,7 @@ class ManyVisitsWithGeoIP extends Fixture
         self::checkResponse($t->doTrackPageView('It\'s pitch black...'));
     }
 
-    private function setLocationProvider($file)
+    public function setLocationProvider($file)
     {
         GeoIp::$dbNames['loc'] = array($file);
         GeoIp::$geoIPDatabaseDir = 'tests/lib/geoip-files';
diff --git a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
index fdec9cb09b..0681c151d5 100755
--- a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
@@ -566,7 +566,7 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase
                     } else if (is_numeric($value)) {
                         $values[] = $value;
                     } else if (!ctype_print($value)) {
-                        $values[] = "x'" . bin2hex(substr($value, 1)) . "'";
+                        $values[] = "x'" . bin2hex($value) . "'";
                     } else {
                         $values[] = "?";
                         $bind[] = $value;