Merge branch 'master' into morpheus_defaulttheme

3 files changed, 17 insertions, 12 deletions

diff --git a/tests/PHPUnit/Core/DeprecatedMethodsTest.php b/tests/PHPUnit/Core/DeprecatedMethodsTest.php
index e3c7336e93..c977dffc71 100644
--- a/tests/PHPUnit/Core/DeprecatedMethodsTest.php
+++ b/tests/PHPUnit/Core/DeprecatedMethodsTest.php
@@ -22,6 +22,10 @@ class DeprecatedMethodsTest extends PHPUnit_Framework_TestCase
 
         $validTill = '2014-10-01';
         $this->assertDeprecatedMethodIsRemoved('\Piwik\Config', 'getConfigSuperUserForBackwardCompatibility', $validTill);
+        $this->assertDeprecatedMethodIsRemoved('\Piwik\Menu\MenuAdmin', 'addEntry', $validTill);
+        $this->assertDeprecatedMethodIsRemoved('\Piwik\Menu\MenuAdmin', 'removeEntry', $validTill);
+        $this->assertDeprecatedMethodIsRemoved('\Piwik\Menu\MenuTop', 'addEntry', $validTill);
+        $this->assertDeprecatedMethodIsRemoved('\Piwik\Menu\MenuTop', 'removeEntry', $validTill);
 
         $validTill = '2014-10-15';
         $this->assertDeprecatedMethodIsRemoved('\Piwik\SettingsPiwik', 'rewriteTmpPathWithHostname', $validTill);
diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
index 225a2ae4c4..d5fdeca1f5 100644
--- a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
+++ b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
@@ -9,6 +9,7 @@ use Piwik\Access;
 use Piwik\Plugins\MobileMessaging\API as APIMobileMessaging;
 use Piwik\Plugins\MobileMessaging\MobileMessaging;
 use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
+use Piwik\Plugins\ScheduledReports\Menu;
 use Piwik\Plugins\ScheduledReports\ScheduledReports;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\ScheduledTask;
@@ -201,9 +202,9 @@ class Plugins_ScheduledReportsTest extends DatabaseTestCase
         // unload MobileMessaging plugin
         \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports'));
 
-        $pdfReportPlugin = new ScheduledReports();
+        $pdfReportPlugin = new Menu();
         $this->assertEquals(
-            ScheduledReports::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY,
+            Menu::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY,
             $pdfReportPlugin->getTopMenuTranslationKey()
         );
     }
@@ -217,9 +218,9 @@ class Plugins_ScheduledReportsTest extends DatabaseTestCase
         FakeAccess::$identity = 'anonymous';
         Access::setSingletonInstance($anonymousAccess);
 
-        $pdfReportPlugin = new ScheduledReports();
+        $pdfReportPlugin = new Menu();
         $this->assertEquals(
-            ScheduledReports::MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY,
+            Menu::MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY,
             $pdfReportPlugin->getTopMenuTranslationKey()
         );
     }
@@ -236,9 +237,9 @@ class Plugins_ScheduledReportsTest extends DatabaseTestCase
         self::setSuperUser();
         APIMobileMessaging::getInstance()->setSMSAPICredential('StubbedProvider', '');
 
-        $pdfReportPlugin = new ScheduledReports();
+        $pdfReportPlugin = new Menu();
         $this->assertEquals(
-            ScheduledReports::MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY,
+            Menu::MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY,
             $pdfReportPlugin->getTopMenuTranslationKey()
         );
     }
@@ -251,9 +252,9 @@ class Plugins_ScheduledReportsTest extends DatabaseTestCase
      */
     public function testGetTopMenuTranslationKeyNoReportMobileAccountKO()
     {
-        $pdfReportPlugin = new ScheduledReports();
+        $pdfReportPlugin = new Menu();
         $this->assertEquals(
-            ScheduledReports::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY,
+            Menu::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY,
             $pdfReportPlugin->getTopMenuTranslationKey()
         );
     }
@@ -279,9 +280,9 @@ class Plugins_ScheduledReportsTest extends DatabaseTestCase
             )
         );
 
-        $pdfReportPlugin = new ScheduledReports();
+        $pdfReportPlugin = new Menu();
         $this->assertEquals(
-            ScheduledReports::MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY,
+            Menu::MOBILE_MESSAGING_TOP_MENU_TRANSLATION_KEY,
             $pdfReportPlugin->getTopMenuTranslationKey()
         );
     }
@@ -300,9 +301,9 @@ class Plugins_ScheduledReportsTest extends DatabaseTestCase
 
         self::addReport(self::getMonthlyEmailReportData($this->idSite));
 
-        $pdfReportPlugin = new ScheduledReports();
+        $pdfReportPlugin = new Menu();
         $this->assertEquals(
-            ScheduledReports::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY,
+            Menu::PDF_REPORTS_TOP_MENU_TRANSLATION_KEY,
             $pdfReportPlugin->getTopMenuTranslationKey()
         );
     }
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
-Subproject fca461721936b039e90ee2b43420c1125d00225
+Subproject b086c264ef3bf0104415bd30a04bcc8d6e2ea32