refs #3332, refs #3227 fixed possible fatal if no row is available for page...

refs #3332, refs #3227 fixed possible fatal if no row is available for page metrics; do not run transition tests by default; ensure that _all_ plugins are loaded before integration tests

git-svn-id: http://dev.piwik.org/svn/trunk@6868 59fd770c-687e-43c8-a1e3-f5a4ff64c105

plugins/Transitions/API.php

@@ -109,11 +109,20 @@ class Piwik_Transitions_API
 		}
 		
 		$row = $dataTable->getFirstRow();
-		$report['pageMetrics'] = array(
-			'pageviews' => intval($row->getColumn('nb_hits')),
-			'exits' => intval($row->getColumn('exit_nb_visits')),
-			'bounces' => intval($row->getColumn('entry_bounce_count'))
-		);
+
+        if ($row !== false) {
+            $report['pageMetrics'] = array(
+                'pageviews' => intval($row->getColumn('nb_hits')),
+                'exits'     => intval($row->getColumn('exit_nb_visits')),
+                'bounces'   => intval($row->getColumn('entry_bounce_count'))
+            );
+        } else {
+            $report['pageMetrics'] = array(
+                'pageviews' => 0,
+                'exits'     => 0,
+                'bounces'   => 0
+            );
+        }
 	}
 
 	/**

tests/PHPUnit/Integration/TrackCustomVariablesAndCampaigns_ForceUsingVisitIdNotHeuristicsTest.php

@@ -79,15 +79,15 @@ class Test_Piwik_Integration_TrackCustomVariablesAndCampaigns_ForceUsingVisitIdN
         $_COOKIE['_pk_id_1_1fff']   = 'ca0afe7b6b692ff5.1302307497.1.1302307497.1302307497';
         $_COOKIE['_pk_ref_1_1fff']  = '["YEAH","RIGHT!",1302307497,"http://referrer.example.org/page/sub?query=test&test2=test3"]';
         $_COOKIE['_pk_cvar_1_1fff'] = '{"1":["VAR 1 set, var 2 not set","yes"],"3":["var 3 set","yes!!!!"]}';
-        self::assertTrue($t->getVisitorId() == 'ca0afe7b6b692ff5');
-        self::assertTrue($t->getAttributionInfo() == $_COOKIE['_pk_ref_1_1fff']);
-        self::assertTrue($t->getCustomVariable(1) == array("VAR 1 set, var 2 not set", "yes"));
-        self::assertTrue($t->getCustomVariable(2) == false);
-        self::assertTrue($t->getCustomVariable(3) == array("var 3 set", "yes!!!!"));
-        self::assertTrue($t->getCustomVariable(4) == false);
-        self::assertTrue($t->getCustomVariable(5) == false);
-        self::assertTrue($t->getCustomVariable(6) == false);
-        self::assertTrue($t->getCustomVariable(-1) == false);
+        self::assertEquals('ca0afe7b6b692ff5', $t->getVisitorId());
+        self::assertEquals($t->getAttributionInfo(), $_COOKIE['_pk_ref_1_1fff']);
+        self::assertEquals(array("VAR 1 set, var 2 not set", "yes"), $t->getCustomVariable(1));
+        self::assertFalse($t->getCustomVariable(2));
+        self::assertEquals(array("var 3 set", "yes!!!!"), $t->getCustomVariable(3));
+        self::assertFalse($t->getCustomVariable(4));
+        self::assertFalse($t->getCustomVariable(5));
+        self::assertFalse($t->getCustomVariable(6));
+        self::assertFalse($t->getCustomVariable(-1));
         unset($_COOKIE['_pk_id_1_1fff']);
         unset($_COOKIE['_pk_ref_1_1fff']);
         unset($_COOKIE['_pk_cvar_1_1fff']);

tests/PHPUnit/IntegrationTestCase.php

@@ -63,7 +63,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
 
         // Load and install plugins
         $pluginsManager = Piwik_PluginsManager::getInstance();
-        $plugins = Piwik_Config::getInstance()->Plugins['Plugins'];
+        $plugins = $pluginsManager->readPluginsDirectory();
 
         $pluginsManager->loadPlugins( $plugins );
         $pluginsManager->installLoadedPlugins();
@@ -120,6 +120,7 @@ abstract class IntegrationTestCase extends PHPUnit_Framework_TestCase
         'ExampleAPI',
         'PDFReports',
         'MobileMessaging',
+        'Transitions',
         'API',
         'ImageGraph',
     );