diff options
Diffstat (limited to 'plugins')
37 files changed, 46 insertions, 49 deletions
diff --git a/plugins/API/tests/Integration/RowEvolutionTest.php b/plugins/API/tests/Integration/RowEvolutionTest.php index cb3dc66a99..b796562cac 100644 --- a/plugins/API/tests/Integration/RowEvolutionTest.php +++ b/plugins/API/tests/Integration/RowEvolutionTest.php @@ -9,8 +9,8 @@ namespace Piwik\Plugins\API\tests\Integration; use Piwik\Plugins\API\RowEvolution; -use Piwik\Tests\Impl\Fixture; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\Fixture; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * @group API diff --git a/plugins/API/tests/Integration/RssRendererTest.php b/plugins/API/tests/Integration/RssRendererTest.php index 3011273d69..20ed016a61 100644 --- a/plugins/API/tests/Integration/RssRendererTest.php +++ b/plugins/API/tests/Integration/RssRendererTest.php @@ -11,8 +11,8 @@ namespace Piwik\Plugins\API\tests\Integration; use Piwik\Access; use Piwik\DataTable; use Piwik\Plugins\API\Renderer\Rss; -use Piwik\Tests\Impl\Fixture; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\Fixture; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * @group Plugin diff --git a/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php b/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php index 9d4c08746a..92a6e5e319 100644 --- a/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php +++ b/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php @@ -9,7 +9,7 @@ namespace Piwik\Plugins\Contents\tests\Fixtures; use Piwik\Date; use Piwik\Plugins\Goals\API as APIGoals; -use Piwik\Tests\Impl\Fixture; +use Piwik\Tests\Framework\Fixture; use PiwikTracker; /** diff --git a/plugins/Contents/tests/System/ContentsTest.php b/plugins/Contents/tests/System/ContentsTest.php index c5304fb19e..4332217622 100644 --- a/plugins/Contents/tests/System/ContentsTest.php +++ b/plugins/Contents/tests/System/ContentsTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Plugins\Contents\tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Plugins\Contents\tests\Fixtures\TwoVisitsWithContents; use Piwik\Translate; diff --git a/plugins/CoreConsole/Commands/TestsSetupFixture.php b/plugins/CoreConsole/Commands/TestsSetupFixture.php index 11f5761b93..fc3ccd4909 100644 --- a/plugins/CoreConsole/Commands/TestsSetupFixture.php +++ b/plugins/CoreConsole/Commands/TestsSetupFixture.php @@ -11,7 +11,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; use Piwik\Config; use Piwik\Plugin\ConsoleCommand; use Piwik\Url; -use Piwik\Tests\Impl\Fixture; +use Piwik\Tests\Framework\Fixture; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -213,12 +213,11 @@ class TestsSetupFixture extends ConsoleCommand private function requireFixtureFiles(InputInterface $input) { + \Piwik\Loader::registerTestNamespace(); + require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php'; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/FakeAccess.php'; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/TestingEnvironment.php'; - require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Impl/SystemTestCase.php'; - require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Impl/Fixture.php'; - require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Impl/IntegrationTestCase.php'; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php'; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/Fixture.php'; diff --git a/plugins/CorePluginsAdmin/tests/Integration/UpdateCommunicationTest.php b/plugins/CorePluginsAdmin/tests/Integration/UpdateCommunicationTest.php index 5743c42e46..0aeb99dae8 100644 --- a/plugins/CorePluginsAdmin/tests/Integration/UpdateCommunicationTest.php +++ b/plugins/CorePluginsAdmin/tests/Integration/UpdateCommunicationTest.php @@ -11,7 +11,7 @@ namespace Piwik\Plugins\CorePluginsAdmin\tests\Integration; use Piwik\Config; use Piwik\Option; use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * Class Plugins_CorePluginsAdmin_UpdateCommunicationTest diff --git a/plugins/CoreUpdater/tests/Integration/UpdateCommunicationTest.php b/plugins/CoreUpdater/tests/Integration/UpdateCommunicationTest.php index 10f408206f..8bda8a2699 100644 --- a/plugins/CoreUpdater/tests/Integration/UpdateCommunicationTest.php +++ b/plugins/CoreUpdater/tests/Integration/UpdateCommunicationTest.php @@ -13,7 +13,7 @@ use Piwik\Option; use Piwik\Plugins\CoreUpdater\UpdateCommunication; use Piwik\UpdateCheck; use Piwik\Version; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * Class Plugins_CoreUpdater_UpdateCommunicationTest diff --git a/plugins/CustomVariables/tests/Commands/InfoTest.php b/plugins/CustomVariables/tests/Commands/InfoTest.php index 455cdd10e2..fe9e1cc7e6 100644 --- a/plugins/CustomVariables/tests/Commands/InfoTest.php +++ b/plugins/CustomVariables/tests/Commands/InfoTest.php @@ -13,7 +13,7 @@ use Piwik\Plugins\CustomVariables\Commands\Info; use Piwik\Plugins\CustomVariables\Model; use Symfony\Component\Console\Application; use Symfony\Component\Console\Tester\CommandTester; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * @group CustomVariables diff --git a/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php b/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php index f48473b5e9..e70c3515bb 100644 --- a/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php +++ b/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php @@ -13,7 +13,7 @@ use Piwik\Plugins\CustomVariables\Commands\SetNumberOfCustomVariables; use Piwik\Plugins\CustomVariables\CustomVariables; use Symfony\Component\Console\Application; use Symfony\Component\Console\Tester\CommandTester; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * @group CustomVariables diff --git a/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php b/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php index 82b8129bbb..c1a75e0b26 100644 --- a/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php +++ b/plugins/CustomVariables/tests/Fixtures/VisitWithManyCustomVariables.php @@ -9,7 +9,7 @@ namespace Piwik\Plugins\CustomVariables\tests\Fixtures; use Piwik\Plugins\CustomVariables\Model; use Piwik\Plugins\Goals\API; -use Piwik\Tests\Impl\Fixture; +use Piwik\Tests\Framework\Fixture; /** * Adds one site with two goals and tracks two visits with custom variables. diff --git a/plugins/CustomVariables/tests/Integration/CustomVariablesTest.php b/plugins/CustomVariables/tests/Integration/CustomVariablesTest.php index 5144dc4489..75832efe37 100644 --- a/plugins/CustomVariables/tests/Integration/CustomVariablesTest.php +++ b/plugins/CustomVariables/tests/Integration/CustomVariablesTest.php @@ -9,7 +9,7 @@ namespace Piwik\Plugins\CustomVariables\tests; use Piwik\Plugins\CustomVariables\CustomVariables; use Piwik\Tracker\Cache; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * @group CustomVariables diff --git a/plugins/CustomVariables/tests/Integration/ModelTest.php b/plugins/CustomVariables/tests/Integration/ModelTest.php index 384d204478..128e5b09ef 100644 --- a/plugins/CustomVariables/tests/Integration/ModelTest.php +++ b/plugins/CustomVariables/tests/Integration/ModelTest.php @@ -9,7 +9,7 @@ namespace Piwik\Plugins\CustomVariables\tests; use Piwik\Db; use Piwik\Plugins\CustomVariables\Model; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * @group CustomVariables diff --git a/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php b/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php index 00158a1e48..79c6f5ec43 100644 --- a/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php +++ b/plugins/CustomVariables/tests/System/CustomVariablesSystemTest.php @@ -8,7 +8,7 @@ namespace Piwik\Plugins\CustomVariables\tests; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; /** * @group CustomVariables diff --git a/plugins/ExamplePlugin/tests/Fixtures/SimpleFixtureTrackFewVisits.php b/plugins/ExamplePlugin/tests/Fixtures/SimpleFixtureTrackFewVisits.php index 2c0b38d172..89d99a7005 100644 --- a/plugins/ExamplePlugin/tests/Fixtures/SimpleFixtureTrackFewVisits.php +++ b/plugins/ExamplePlugin/tests/Fixtures/SimpleFixtureTrackFewVisits.php @@ -8,7 +8,7 @@ namespace Piwik\Plugins\ExamplePlugin\tests\Fixtures; use Piwik\Date; -use Piwik\Tests\Impl\Fixture; +use Piwik\Tests\Framework\Fixture; /** * Generates tracker testing data for our SimpleSystemTest diff --git a/plugins/ExamplePlugin/tests/Integration/SimpleTest.php b/plugins/ExamplePlugin/tests/Integration/SimpleTest.php index 01ff197cf8..3d8ac904f8 100644 --- a/plugins/ExamplePlugin/tests/Integration/SimpleTest.php +++ b/plugins/ExamplePlugin/tests/Integration/SimpleTest.php @@ -8,7 +8,7 @@ namespace Piwik\Plugins\ExamplePlugin\tests\Integration; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * @group ExamplePlugin diff --git a/plugins/ExamplePlugin/tests/System/SimpleSystemTest.php b/plugins/ExamplePlugin/tests/System/SimpleSystemTest.php index 873c4e4fbe..4594c3be4c 100644 --- a/plugins/ExamplePlugin/tests/System/SimpleSystemTest.php +++ b/plugins/ExamplePlugin/tests/System/SimpleSystemTest.php @@ -9,7 +9,7 @@ namespace Piwik\Plugins\ExamplePlugin\tests\System; use Piwik\Plugins\ExamplePlugin\tests\fixtures\SimpleFixtureTrackFewVisits; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; /** * @group ExamplePlugin diff --git a/plugins/Goals/tests/Integration/APITest.php b/plugins/Goals/tests/Integration/APITest.php index bc3a960e83..8f64117039 100644 --- a/plugins/Goals/tests/Integration/APITest.php +++ b/plugins/Goals/tests/Integration/APITest.php @@ -11,8 +11,8 @@ namespace Piwik\Plugins\Goals\tests\Integration; use Piwik\Access; use Piwik\Piwik; use Piwik\Plugins\Goals\API; -use Piwik\Tests\Impl\Fixture; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\Fixture; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * @group Goals diff --git a/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php b/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php index 7041e6b573..e2a8e7f2c4 100644 --- a/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php +++ b/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php @@ -9,7 +9,7 @@ namespace Piwik\Plugins\Insights\tests\Fixtures; use Piwik\Date; -use Piwik\Tests\Impl\Fixture; +use Piwik\Tests\Framework\Fixture; /** * Adds one website and tracks several visits from one visitor on diff --git a/plugins/Insights/tests/Integration/ApiTest.php b/plugins/Insights/tests/Integration/ApiTest.php index 2a75247021..dfa76dcde1 100644 --- a/plugins/Insights/tests/Integration/ApiTest.php +++ b/plugins/Insights/tests/Integration/ApiTest.php @@ -14,9 +14,7 @@ use Piwik\DataTable; use Piwik\DataTable\Row; use Piwik\Plugins\Insights\API; use Piwik\Plugins\Insights\tests\Fixtures\SomeVisitsDifferentPathsOnTwoDays; -use Piwik\Tests\Impl\IntegrationTestCase; -use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tracker\Cache; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Translate; /** diff --git a/plugins/Insights/tests/Integration/ModelTest.php b/plugins/Insights/tests/Integration/ModelTest.php index 4f62630bd9..2226684ab7 100644 --- a/plugins/Insights/tests/Integration/ModelTest.php +++ b/plugins/Insights/tests/Integration/ModelTest.php @@ -11,7 +11,7 @@ namespace Piwik\Plugins\Insights\tests; use Piwik\DataTable; use Piwik\Plugins\Insights\Model; use Piwik\Plugins\Insights\tests\Fixtures\SomeVisitsDifferentPathsOnTwoDays; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; /** * @group Insights diff --git a/plugins/LeftMenu/tests/Integration/APITest.php b/plugins/LeftMenu/tests/Integration/APITest.php index e4500b2e41..00bf03830f 100644 --- a/plugins/LeftMenu/tests/Integration/APITest.php +++ b/plugins/LeftMenu/tests/Integration/APITest.php @@ -12,7 +12,7 @@ use Piwik\Access; use Piwik\Plugins\LeftMenu\API; use Piwik\Plugins\LeftMenu\Settings; use \FakeAccess; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * @group LeftMenu diff --git a/plugins/Live/tests/Integration/APITest.php b/plugins/Live/tests/Integration/APITest.php index fcfc410bcf..fc56b0d16e 100644 --- a/plugins/Live/tests/Integration/APITest.php +++ b/plugins/Live/tests/Integration/APITest.php @@ -14,8 +14,8 @@ use Piwik\Plugins\Goals\API as GoalsApi; use Piwik\Plugins\Live\API; use FakeAccess; use Piwik\Access; -use Piwik\Tests\Impl\Fixture; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\Fixture; +use Piwik\Tests\Framework\TestCase\SystemTestCase; /** * @group Live diff --git a/plugins/Login/tests/Integration/LoginTest.php b/plugins/Login/tests/Integration/LoginTest.php index 4007061bd5..b250bcf8e0 100644 --- a/plugins/Login/tests/Integration/LoginTest.php +++ b/plugins/Login/tests/Integration/LoginTest.php @@ -13,7 +13,7 @@ use Piwik\AuthResult; use Piwik\DbHelper; use Piwik\Plugins\Login\Auth; use Piwik\Plugins\UsersManager\API; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use FakeAccess; require_once PIWIK_INCLUDE_PATH . '/plugins/Login/Auth.php'; diff --git a/plugins/MobileMessaging/tests/Integration/MobileMessagingTest.php b/plugins/MobileMessaging/tests/Integration/MobileMessagingTest.php index f387534bf3..022dfda9ba 100644 --- a/plugins/MobileMessaging/tests/Integration/MobileMessagingTest.php +++ b/plugins/MobileMessaging/tests/Integration/MobileMessagingTest.php @@ -14,7 +14,7 @@ use Piwik\Plugins\MobileMessaging\MobileMessaging; use Piwik\Plugins\MobileMessaging\SMSProvider; use Piwik\Plugins\ScheduledReports\API as APIScheduledReports; use Piwik\Plugins\SitesManager\API as APISitesManager; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use FakeAccess; /** diff --git a/plugins/MultiSites/tests/Integration/MultiSitesTest.php b/plugins/MultiSites/tests/Integration/MultiSitesTest.php index a5f372b7a5..8b6d7924a7 100644 --- a/plugins/MultiSites/tests/Integration/MultiSitesTest.php +++ b/plugins/MultiSites/tests/Integration/MultiSitesTest.php @@ -11,7 +11,7 @@ namespace Piwik\Plugins\MultiSites\tests\Integration; use Piwik\Access; use Piwik\Plugins\MultiSites\API as APIMultiSites; use Piwik\Plugins\SitesManager\API as APISitesManager; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * Class Plugins_MultiSitesTest diff --git a/plugins/PrivacyManager/tests/Integration/PrivacyManagerConfigTest.php b/plugins/PrivacyManager/tests/Integration/PrivacyManagerConfigTest.php index 07092248fe..4d2a121ee3 100644 --- a/plugins/PrivacyManager/tests/Integration/PrivacyManagerConfigTest.php +++ b/plugins/PrivacyManager/tests/Integration/PrivacyManagerConfigTest.php @@ -10,7 +10,7 @@ namespace Piwik\Plugins\PrivacyManager\tests; use Piwik\Option; use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * Class Plugins_SitesManagerTest diff --git a/plugins/PrivacyManager/tests/Integration/PrivacyManagerTest.php b/plugins/PrivacyManager/tests/Integration/PrivacyManagerTest.php index 50fce5f0a7..2b8233ffa7 100644 --- a/plugins/PrivacyManager/tests/Integration/PrivacyManagerTest.php +++ b/plugins/PrivacyManager/tests/Integration/PrivacyManagerTest.php @@ -9,7 +9,7 @@ namespace Piwik\Plugins\PrivacyManager\tests; use Piwik\Plugins\PrivacyManager\PrivacyManager; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * Class Plugins_SitesManagerTest diff --git a/plugins/ScheduledReports/tests/Integration/ApiTest.php b/plugins/ScheduledReports/tests/Integration/ApiTest.php index be13cb2b10..e1efb7fdcb 100644 --- a/plugins/ScheduledReports/tests/Integration/ApiTest.php +++ b/plugins/ScheduledReports/tests/Integration/ApiTest.php @@ -19,7 +19,7 @@ use Piwik\ScheduledTask; use Piwik\ScheduledTime\Monthly; use Piwik\ScheduledTime; use Piwik\Site; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use FakeAccess; use Exception; use ReflectionMethod; diff --git a/plugins/ScheduledReports/tests/Integration/ScheduledReportsTest.php b/plugins/ScheduledReports/tests/Integration/ScheduledReportsTest.php index b0bb56363f..dfe17b9dfd 100644 --- a/plugins/ScheduledReports/tests/Integration/ScheduledReportsTest.php +++ b/plugins/ScheduledReports/tests/Integration/ScheduledReportsTest.php @@ -12,8 +12,8 @@ use Piwik\Db; use Piwik\Piwik; use Piwik\Plugins\ScheduledReports\API; use Piwik\Plugins\ScheduledReports\ScheduledReports; -use Piwik\Tests\Impl\Fixture; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\Fixture; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * @group ScheduledReports diff --git a/plugins/SegmentEditor/tests/Integration/SegmentEditorTest.php b/plugins/SegmentEditor/tests/Integration/SegmentEditorTest.php index e5d863e92c..ca90f3b43c 100644 --- a/plugins/SegmentEditor/tests/Integration/SegmentEditorTest.php +++ b/plugins/SegmentEditor/tests/Integration/SegmentEditorTest.php @@ -14,7 +14,7 @@ use Piwik\Piwik; use Piwik\Plugins\SegmentEditor\API; use Piwik\Plugins\SegmentEditor\Model; use Piwik\Plugins\SitesManager\API as APISitesManager; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use FakeAccess; use Exception; diff --git a/plugins/SitesManager/tests/Integration/SiteUrlsTest.php b/plugins/SitesManager/tests/Integration/SiteUrlsTest.php index 8cc7cc5b14..4614f7cece 100644 --- a/plugins/SitesManager/tests/Integration/SiteUrlsTest.php +++ b/plugins/SitesManager/tests/Integration/SiteUrlsTest.php @@ -10,7 +10,7 @@ namespace Piwik\Plugins\SitesManager\tests\Integration; use Piwik\CacheFile; use Piwik\Plugins\SitesManager\API; use Piwik\Plugins\SitesManager\SiteUrls; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * @group SitesManager diff --git a/plugins/SitesManager/tests/Integration/SitesManagerTest.php b/plugins/SitesManager/tests/Integration/SitesManagerTest.php index 2d2ac466ef..c49ff6b5e4 100644 --- a/plugins/SitesManager/tests/Integration/SitesManagerTest.php +++ b/plugins/SitesManager/tests/Integration/SitesManagerTest.php @@ -12,7 +12,7 @@ use Piwik\Access; use Piwik\Plugins\SitesManager\API; use Piwik\Plugins\UsersManager\API as APIUsersManager; use Piwik\Site; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use FakeAccess; use Exception; use PHPUnit_Framework_Constraint_IsType; diff --git a/plugins/UserSettings/tests/Fixtures/LanguageFixture.php b/plugins/UserSettings/tests/Fixtures/LanguageFixture.php index 6cbd9d8343..dd3089a365 100644 --- a/plugins/UserSettings/tests/Fixtures/LanguageFixture.php +++ b/plugins/UserSettings/tests/Fixtures/LanguageFixture.php @@ -10,7 +10,7 @@ namespace Piwik\Plugins\UserSettings\tests\Fixtures; -use Piwik\Tests\Impl\Fixture; +use Piwik\Tests\Framework\Fixture; use Piwik\Date; use Piwik\Common; diff --git a/plugins/UserSettings/tests/System/GetLanguageSystemTest.php b/plugins/UserSettings/tests/System/GetLanguageSystemTest.php index 70db55616b..3c409c1112 100644 --- a/plugins/UserSettings/tests/System/GetLanguageSystemTest.php +++ b/plugins/UserSettings/tests/System/GetLanguageSystemTest.php @@ -10,7 +10,7 @@ namespace Piwik\Plugins\UserSettings\tests\System; use Piwik\Plugins\UserSettings\tests\Fixtures\LanguageFixture; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; /** * Class GetLanguageSystemTest diff --git a/plugins/UsersManager/tests/Integration/APITest.php b/plugins/UsersManager/tests/Integration/APITest.php index e84cd5b750..038fee2934 100644 --- a/plugins/UsersManager/tests/Integration/APITest.php +++ b/plugins/UsersManager/tests/Integration/APITest.php @@ -11,8 +11,8 @@ use Piwik\Access; use FakeAccess; use Piwik\Piwik; use Piwik\Plugins\UsersManager\API; -use Piwik\Tests\Impl\Fixture; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\Fixture; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * @group UsersManager diff --git a/plugins/UsersManager/tests/Integration/UserPreferencesTest.php b/plugins/UsersManager/tests/Integration/UserPreferencesTest.php index cd23e7baa3..34a5907c0a 100644 --- a/plugins/UsersManager/tests/Integration/UserPreferencesTest.php +++ b/plugins/UsersManager/tests/Integration/UserPreferencesTest.php @@ -13,8 +13,8 @@ use Piwik\Plugins\UsersManager\UserPreferences; use Piwik\Plugins\UsersManager\API as APIUsersManager; use FakeAccess; use Piwik\Access; -use Piwik\Tests\Impl\Fixture; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\Fixture; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** * @group UsersManager diff --git a/plugins/UsersManager/tests/Integration/UsersManagerTest.php b/plugins/UsersManager/tests/Integration/UsersManagerTest.php index e813c2ac1b..6b847e6d5a 100644 --- a/plugins/UsersManager/tests/Integration/UsersManagerTest.php +++ b/plugins/UsersManager/tests/Integration/UsersManagerTest.php @@ -13,7 +13,7 @@ use Piwik\Plugins\SitesManager\API as APISitesManager; use Piwik\Plugins\UsersManager\API; use Piwik\Plugins\UsersManager\Model; use Piwik\Translate; -use Piwik\Tests\Impl\IntegrationTestCase; +use Piwik\Tests\Framework\TestCase\IntegrationTestCase; use FakeAccess; use Exception; |