diff options
author | Thomas Steur <thomas.steur@googlemail.com> | 2014-10-13 06:21:24 +0400 |
---|---|---|
committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-10-13 06:21:24 +0400 |
commit | 9f4ba4eea6c85a92b87fbad6f0556ee5d8551762 (patch) | |
tree | 0225fe694c5d6b15ca9ba9d528e16f03ce4249bd /tests/PHPUnit/System | |
parent | c87dc623acf264d7559991cfc66cefa85bba4f1f (diff) |
refs #5940 moved files into a subfolder framework, added autoloader to remove duplicated code to load autoload.php and to be able to register more autoloaders (eg for test files) on demand. This I got read of many includes that had to be updated all the time and that had to be updated all the time when moving iles
Diffstat (limited to 'tests/PHPUnit/System')
48 files changed, 55 insertions, 61 deletions
diff --git a/tests/PHPUnit/System/AnnotationsTest.php b/tests/PHPUnit/System/AnnotationsTest.php index 42a5bb2376..722b104978 100755 --- a/tests/PHPUnit/System/AnnotationsTest.php +++ b/tests/PHPUnit/System/AnnotationsTest.php @@ -10,7 +10,7 @@ namespace Piwik\Tests\System; use Piwik\Access; use Piwik\API\Request; use Piwik\Plugins\Annotations\API; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoSitesWithAnnotations; use FakeAccess; use Exception; diff --git a/tests/PHPUnit/System/ApiGetReportMetadataTest.php b/tests/PHPUnit/System/ApiGetReportMetadataTest.php index 7772da6224..1270361c39 100755 --- a/tests/PHPUnit/System/ApiGetReportMetadataTest.php +++ b/tests/PHPUnit/System/ApiGetReportMetadataTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\API\Proxy; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\ThreeGoalsOnePageview; /** diff --git a/tests/PHPUnit/System/ApiGetReportMetadataYearTest.php b/tests/PHPUnit/System/ApiGetReportMetadataYearTest.php index 78edafbb19..c9b8f30e0d 100755 --- a/tests/PHPUnit/System/ApiGetReportMetadataYearTest.php +++ b/tests/PHPUnit/System/ApiGetReportMetadataYearTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\InvalidVisits; /** diff --git a/tests/PHPUnit/System/ArchiveCronTest.php b/tests/PHPUnit/System/ArchiveCronTest.php index 3d328a3927..c0a834b5d7 100644 --- a/tests/PHPUnit/System/ArchiveCronTest.php +++ b/tests/PHPUnit/System/ArchiveCronTest.php @@ -9,9 +9,9 @@ namespace Piwik\Tests\System; use Piwik\Date; use Piwik\Plugins\SitesManager\API; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\ManySitesImportedLogs; -use Piwik\Tests\Impl\Fixture; +use Piwik\Tests\Framework\Fixture; use Exception; /** diff --git a/tests/PHPUnit/System/ArchiveInvalidationTest.php b/tests/PHPUnit/System/ArchiveInvalidationTest.php index 1a0d1dff38..bd97f78413 100644 --- a/tests/PHPUnit/System/ArchiveInvalidationTest.php +++ b/tests/PHPUnit/System/ArchiveInvalidationTest.php @@ -10,7 +10,7 @@ namespace Piwik\Tests\System; use Piwik\API\Request; use Piwik\Config; use Piwik\Tests\Fixtures\VisitsTwoWebsitesWithAdditionalVisits; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; /** * Track visits before website creation date and test that Piwik handles them correctly. diff --git a/tests/PHPUnit/System/ArchiveWebTest.php b/tests/PHPUnit/System/ArchiveWebTest.php index 610c83de45..869795dec6 100644 --- a/tests/PHPUnit/System/ArchiveWebTest.php +++ b/tests/PHPUnit/System/ArchiveWebTest.php @@ -9,9 +9,9 @@ namespace Piwik\Tests\System; use Piwik\Option; use Piwik\Http; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\ManySitesImportedLogs; -use Piwik\Tests\Impl\Fixture; +use Piwik\Tests\Framework\Fixture; use Exception; /** diff --git a/tests/PHPUnit/System/AutoSuggestAPITest.php b/tests/PHPUnit/System/AutoSuggestAPITest.php index f86e6b869c..d7d23f58c5 100644 --- a/tests/PHPUnit/System/AutoSuggestAPITest.php +++ b/tests/PHPUnit/System/AutoSuggestAPITest.php @@ -9,9 +9,9 @@ namespace Piwik\Tests\System; use Piwik\API\Request; use Piwik\Date; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\ManyVisitsWithGeoIP; -use Piwik\Tests\Impl\Fixture; +use Piwik\Tests\Framework\Fixture; /** * testing a the auto suggest API for all known segments diff --git a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php index 0ed7dc208d..cc13b51e91 100644 --- a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php +++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php @@ -10,9 +10,9 @@ namespace Piwik\Tests\System; use Piwik\Common; use Piwik\Db; use Piwik\Plugins\VisitFrequency\API as VisitFrequencyApi; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\SqlDump; -use Piwik\Tests\Impl\Fixture; +use Piwik\Tests\Framework\Fixture; /** * Tests that Piwik 2.0 works w/ data from Piwik 1.12. diff --git a/tests/PHPUnit/System/BlobReportLimitingTest.php b/tests/PHPUnit/System/BlobReportLimitingTest.php index f38ee05da7..f54a6aaafd 100755 --- a/tests/PHPUnit/System/BlobReportLimitingTest.php +++ b/tests/PHPUnit/System/BlobReportLimitingTest.php @@ -9,11 +9,9 @@ namespace Piwik\Tests\System; use Piwik\Config; use Piwik\Plugins\Actions\ArchivingHelper; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\ManyVisitsWithMockLocationProvider; -require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php'; - /** * Test Piwik's report limiting code. Make sure the datatable_archiving_maximum_rows_... * config options limit the size of certain reports when archiving. diff --git a/tests/PHPUnit/System/CsvExportTest.php b/tests/PHPUnit/System/CsvExportTest.php index 2069b70cd4..5c251186c6 100755 --- a/tests/PHPUnit/System/CsvExportTest.php +++ b/tests/PHPUnit/System/CsvExportTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; /** diff --git a/tests/PHPUnit/System/CustomEventsTest.php b/tests/PHPUnit/System/CustomEventsTest.php index 1560a91b21..a655750164 100644 --- a/tests/PHPUnit/System/CustomEventsTest.php +++ b/tests/PHPUnit/System/CustomEventsTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoVisitsWithCustomEvents; /** diff --git a/tests/PHPUnit/System/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/System/EcommerceOrderWithItemsTest.php index 0cf6423a8d..5ac300b2e9 100755 --- a/tests/PHPUnit/System/EcommerceOrderWithItemsTest.php +++ b/tests/PHPUnit/System/EcommerceOrderWithItemsTest.php @@ -9,7 +9,7 @@ namespace Piwik\Tests\System; use Piwik\Date; use Piwik\Piwik; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoSitesEcommerceOrderWithItems; /** diff --git a/tests/PHPUnit/System/FlattenReportsTest.php b/tests/PHPUnit/System/FlattenReportsTest.php index 046bdb8d3d..5d3a645607 100644 --- a/tests/PHPUnit/System/FlattenReportsTest.php +++ b/tests/PHPUnit/System/FlattenReportsTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\ManyVisitsWithSubDirReferrersAndCustomVars; /** diff --git a/tests/PHPUnit/System/ImportLogsTest.php b/tests/PHPUnit/System/ImportLogsTest.php index 9dcbbd2a1d..44c6b7b0b9 100755 --- a/tests/PHPUnit/System/ImportLogsTest.php +++ b/tests/PHPUnit/System/ImportLogsTest.php @@ -9,7 +9,7 @@ namespace Piwik\Tests\System; use Piwik\Access; use Piwik\Plugins\SitesManager\API; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\ManySitesImportedLogs; /** diff --git a/tests/PHPUnit/System/LabelFilterTest.php b/tests/PHPUnit/System/LabelFilterTest.php index d58f42bc4c..809409754b 100644 --- a/tests/PHPUnit/System/LabelFilterTest.php +++ b/tests/PHPUnit/System/LabelFilterTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\OneVisitSeveralPageViews; /** diff --git a/tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php b/tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php index 72994a3f16..8910c8568e 100755 --- a/tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php +++ b/tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php @@ -7,10 +7,8 @@ */ namespace Piwik\Tests\System; -require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php'; - use Piwik\Date; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\ManyVisitsWithGeoIP; /** diff --git a/tests/PHPUnit/System/MultipleSitesArchivingTest.php b/tests/PHPUnit/System/MultipleSitesArchivingTest.php index 25a1c1569c..b62feb8263 100644 --- a/tests/PHPUnit/System/MultipleSitesArchivingTest.php +++ b/tests/PHPUnit/System/MultipleSitesArchivingTest.php @@ -9,9 +9,9 @@ namespace Piwik\Tests\System; use Piwik\Config; use Piwik\Piwik; -use Piwik\Tests\Impl\Fixture; +use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Fixtures\ThreeSitesWithSharedVisitors; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; /** * @group Core diff --git a/tests/PHPUnit/System/NoVisitTest.php b/tests/PHPUnit/System/NoVisitTest.php index a9851358bf..fb4f498386 100755 --- a/tests/PHPUnit/System/NoVisitTest.php +++ b/tests/PHPUnit/System/NoVisitTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\InvalidVisits; /** diff --git a/tests/PHPUnit/System/NonUnicodeTest.php b/tests/PHPUnit/System/NonUnicodeTest.php index 5bcbfe1dd0..e498370559 100755 --- a/tests/PHPUnit/System/NonUnicodeTest.php +++ b/tests/PHPUnit/System/NonUnicodeTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\SomeVisitsWithNonUnicodePageTitles; /** diff --git a/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php b/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php index 5ec5f22d4a..d6f2742da5 100644 --- a/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php +++ b/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\SomeVisitsWithLongUrls; /** diff --git a/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php b/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php index 23d418b0ad..0e2f56aa4d 100755 --- a/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php +++ b/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoVisitsNoKeywordWithBot; /** diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php index 85dcb87673..1ab4ed0505 100755 --- a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php +++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php @@ -10,7 +10,7 @@ namespace Piwik\Tests\System; use Piwik\Common; use Piwik\Db; use Piwik\Piwik; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\VisitsOverSeveralDays; /** diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php index 82629f69ec..a0bdae8d8f 100755 --- a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php +++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\VisitsOverSeveralDays; /** diff --git a/tests/PHPUnit/System/OneVisitorSeveralDaysImportedInRandomOrderTest.php b/tests/PHPUnit/System/OneVisitorSeveralDaysImportedInRandomOrderTest.php index de66f3289b..76a165c35c 100644 --- a/tests/PHPUnit/System/OneVisitorSeveralDaysImportedInRandomOrderTest.php +++ b/tests/PHPUnit/System/OneVisitorSeveralDaysImportedInRandomOrderTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\VisitOverSeveralDaysImportedLogs; /** diff --git a/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php index a3b25892ef..287e6799f1 100755 --- a/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php +++ b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php @@ -9,7 +9,7 @@ namespace Piwik\Tests\System; use Piwik\API\Proxy; use Piwik\Archive; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\OneVisitorTwoVisits; use Exception; diff --git a/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php b/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php index 966382045d..82ce3d5e23 100755 --- a/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php +++ b/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\OneVisitorTwoVisits; /** diff --git a/tests/PHPUnit/System/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php b/tests/PHPUnit/System/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php index 92f1a8bb4a..e38c680f30 100755 --- a/tests/PHPUnit/System/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php +++ b/tests/PHPUnit/System/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Date; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; /** diff --git a/tests/PHPUnit/System/PivotByQueryParamTest.php b/tests/PHPUnit/System/PivotByQueryParamTest.php index 15af9b5373..f46813e879 100644 --- a/tests/PHPUnit/System/PivotByQueryParamTest.php +++ b/tests/PHPUnit/System/PivotByQueryParamTest.php @@ -10,7 +10,7 @@ namespace Piwik\Tests\System; use Piwik\Config; use Piwik\Date; use Piwik\Tests\Fixtures\ManyVisitsWithMockLocationProvider; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; /** * @group Core diff --git a/tests/PHPUnit/System/PrivacyManagerTest.php b/tests/PHPUnit/System/PrivacyManagerTest.php index 79fcd1bccd..18b197a410 100644 --- a/tests/PHPUnit/System/PrivacyManagerTest.php +++ b/tests/PHPUnit/System/PrivacyManagerTest.php @@ -25,8 +25,8 @@ use Piwik\Plugins\VisitorInterest\API as APIVisitorInterest; use Piwik\Site; use Piwik\Tracker\Cache; use Piwik\Tracker\GoalManager; -use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixture; +use Piwik\Tests\Framework\TestCase\SystemTestCase; +use Piwik\Tests\Framework\Fixture; require_once PIWIK_INCLUDE_PATH . '/plugins/PrivacyManager/PrivacyManager.php'; diff --git a/tests/PHPUnit/System/PurgeDataTest.php b/tests/PHPUnit/System/PurgeDataTest.php index 3e1d8f4b53..6573f63db0 100755 --- a/tests/PHPUnit/System/PurgeDataTest.php +++ b/tests/PHPUnit/System/PurgeDataTest.php @@ -7,12 +7,10 @@ */ namespace Piwik\Tests\System; -require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php'; - use Piwik\API\Request; use Piwik\Plugins\PrivacyManager\PrivacyManager; use Piwik\Plugins\PrivacyManager\ReportsPurger; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\OneVisitorTwoVisits; /** diff --git a/tests/PHPUnit/System/RowEvolutionTest.php b/tests/PHPUnit/System/RowEvolutionTest.php index e70379279f..0fba18234d 100755 --- a/tests/PHPUnit/System/RowEvolutionTest.php +++ b/tests/PHPUnit/System/RowEvolutionTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers; /** diff --git a/tests/PHPUnit/System/SiteSearchTest.php b/tests/PHPUnit/System/SiteSearchTest.php index 653d361951..ee9c8bce46 100755 --- a/tests/PHPUnit/System/SiteSearchTest.php +++ b/tests/PHPUnit/System/SiteSearchTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\ThreeSitesWithManyVisitsWithSiteSearch; /** diff --git a/tests/PHPUnit/System/TimezonesTest.php b/tests/PHPUnit/System/TimezonesTest.php index 952f045c16..da5be4e6e5 100644 --- a/tests/PHPUnit/System/TimezonesTest.php +++ b/tests/PHPUnit/System/TimezonesTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Date; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\VisitsInDifferentTimezones; /** diff --git a/tests/PHPUnit/System/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php b/tests/PHPUnit/System/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php index 95da206c6a..2a08882e8d 100755 --- a/tests/PHPUnit/System/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php +++ b/tests/PHPUnit/System/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\SomeVisitsCustomVariablesCampaignsNotHeuristics; /** diff --git a/tests/PHPUnit/System/TrackGoalsAllowMultipleConversionsPerVisitTest.php b/tests/PHPUnit/System/TrackGoalsAllowMultipleConversionsPerVisitTest.php index ab345bee35..df052b6e6b 100755 --- a/tests/PHPUnit/System/TrackGoalsAllowMultipleConversionsPerVisitTest.php +++ b/tests/PHPUnit/System/TrackGoalsAllowMultipleConversionsPerVisitTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Plugins\Goals\API; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\SomeVisitsAllConversions; /** diff --git a/tests/PHPUnit/System/TrackerWindowLookBackTest.php b/tests/PHPUnit/System/TrackerWindowLookBackTest.php index aa908ab316..9530c7c0b0 100644 --- a/tests/PHPUnit/System/TrackerWindowLookBackTest.php +++ b/tests/PHPUnit/System/TrackerWindowLookBackTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\VisitsOverSeveralDays; /** diff --git a/tests/PHPUnit/System/TransitionsTest.php b/tests/PHPUnit/System/TransitionsTest.php index fc0549bdbf..3049d0f823 100644 --- a/tests/PHPUnit/System/TransitionsTest.php +++ b/tests/PHPUnit/System/TransitionsTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\SomeVisitsManyPageviewsWithTransitions; /** diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php index 4755756614..0676950dc8 100755 --- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php +++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays; /** diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php index 8c64abce71..3d9c595367 100755 --- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php +++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Plugins\Goals\Archiver; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays; require_once PIWIK_INCLUDE_PATH . '/plugins/Goals/Goals.php'; diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php index 495ada90aa..65ce66105e 100755 --- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php +++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays; /** diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentContainsTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentContainsTest.php index b2d85a893b..92a4f2dde2 100755 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentContainsTest.php +++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentContainsTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; /** diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php index e0f579782f..dca4a1f294 100755 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php +++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; /** diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php index 1aa078b5b1..2d9c155fee 100755 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php +++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php @@ -8,9 +8,9 @@ namespace Piwik\Tests\System; use Piwik\Plugins\API\API; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; -use Piwik\Tests\Impl\Fixture; +use Piwik\Tests\Framework\Fixture; /** * testing a segment containing all supported fields diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php index 01a5005278..a6ba72de3d 100755 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php +++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php @@ -9,7 +9,7 @@ namespace Piwik\Tests\System; use Piwik\Common; use Piwik\Db; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; /** diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesTest.php index 7bc80d3ade..eb2a28427d 100755 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesTest.php +++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesTest.php @@ -7,7 +7,7 @@ */ namespace Piwik\Tests\System; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; /** diff --git a/tests/PHPUnit/System/UrlNormalizationTest.php b/tests/PHPUnit/System/UrlNormalizationTest.php index a91a01aad0..0b9a55acea 100644 --- a/tests/PHPUnit/System/UrlNormalizationTest.php +++ b/tests/PHPUnit/System/UrlNormalizationTest.php @@ -10,7 +10,7 @@ namespace Piwik\Tests\System; use Piwik\Common; use Piwik\Db; use Piwik\Tracker\Action; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\OneVisitWithAbnormalPageviewUrls; /** diff --git a/tests/PHPUnit/System/UserIdAndVisitorIdTest.php b/tests/PHPUnit/System/UserIdAndVisitorIdTest.php index 4bc0700c08..6652228b3a 100644 --- a/tests/PHPUnit/System/UserIdAndVisitorIdTest.php +++ b/tests/PHPUnit/System/UserIdAndVisitorIdTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\API\Proxy; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\FewVisitsWithSetVisitorId; /** diff --git a/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php b/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php index d958dcc894..15149f0ec5 100644 --- a/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php +++ b/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\API\Request; -use Piwik\Tests\Impl\SystemTestCase; +use Piwik\Tests\Framework\TestCase\SystemTestCase; use Piwik\Tests\Fixtures\TwoSitesVisitsInPast; use Exception; |