this should fix some tests

core/Plugin/ActionDimension.php

@@ -60,7 +60,7 @@ abstract class ActionDimension
     protected function addSegment(Segment $segment)
     {
         $sqlSegment = $segment->getSqlSegment();
-        if (!empty($this->fieldName) && !empty($sqlSegment)) {
+        if (!empty($this->fieldName) && empty($sqlSegment)) {
             $segment->setSqlSegment('log_link_visit_action.' . $this->fieldName);
         }
 

core/Plugin/Manager.php

@@ -1137,6 +1137,16 @@ class Manager extends Singleton
 
     public function isTrackerPlugin(Plugin $plugin)
     {
+        $dimensions = VisitDimension::getDimensions($plugin);
+        if (!empty($dimensions)) {
+            return true;
+        }
+
+        $dimensions = ActionDimension::getDimensions($plugin);
+        if (!empty($dimensions)) {
+            return true;
+        }
+
         $hooks = $plugin->getListHooksRegistered();
         $hookNames = array_keys($hooks);
         foreach ($hookNames as $name) {

core/Plugin/VisitDimension.php

@@ -55,7 +55,7 @@ abstract class VisitDimension
     protected function addSegment(Segment $segment)
     {
         $sqlSegment = $segment->getSqlSegment();
-        if (!empty($this->fieldName) && !empty($sqlSegment)) {
+        if (!empty($this->fieldName) && empty($sqlSegment)) {
             $segment->setSqlSegment('log_visit.' . $this->fieldName);
         }
 

plugins/VisitTime/Columns/Localtime.php

@@ -14,7 +14,7 @@ use Piwik\Plugins\VisitTime\Segment;
 
 class Localtime extends VisitDimension
 {    
-    protected $fieldName = 'HOUR(visitor_localtime)';
+    protected $fieldName = 'visitor_localtime';
 
     protected function init()
     {

plugins/VisitTime/Columns/Servertime.php

@@ -14,7 +14,7 @@ use Piwik\Plugins\VisitTime\Segment;
 
 class Servertime extends VisitDimension
 {    
-    protected $fieldName = 'HOUR(visit_last_action_time)';
+    protected $fieldName = 'visit_last_action_time';
 
     protected function init()
     {

tests/PHPUnit/proxy/includes.php

@@ -14,6 +14,14 @@ require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php';
 require_once PIWIK_INCLUDE_PATH . '/core/Piwik.php';
 require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php';
 require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/TestingEnvironment.php';
+if (file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')) {
+    $vendorDirectory = PIWIK_INCLUDE_PATH . '/vendor';
+} else {
+    $vendorDirectory = PIWIK_INCLUDE_PATH . '/../..';
+}
+require_once $vendorDirectory . '/autoload.php';
+require_once $vendorDirectory . '/mustangostang/spyc/Spyc.php';
+require_once $vendorDirectory . '/piwik/device-detector/DeviceDetector.php';
 
 \Piwik\SettingsServer::setMaxExecutionTime(0);