diff options
47 files changed, 47 insertions, 47 deletions
diff --git a/tests/PHPUnit/System/AnnotationsTest.php b/tests/PHPUnit/System/AnnotationsTest.php index f73587f3ce..42a5bb2376 100755 --- a/tests/PHPUnit/System/AnnotationsTest.php +++ b/tests/PHPUnit/System/AnnotationsTest.php @@ -11,7 +11,7 @@ use Piwik\Access; use Piwik\API\Request; use Piwik\Plugins\Annotations\API; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoSitesWithAnnotations; +use Piwik\Tests\Fixtures\TwoSitesWithAnnotations; use FakeAccess; use Exception; diff --git a/tests/PHPUnit/System/ApiGetReportMetadataTest.php b/tests/PHPUnit/System/ApiGetReportMetadataTest.php index fd9b2b308c..7772da6224 100755 --- a/tests/PHPUnit/System/ApiGetReportMetadataTest.php +++ b/tests/PHPUnit/System/ApiGetReportMetadataTest.php @@ -9,7 +9,7 @@ namespace Piwik\Tests\System; use Piwik\API\Proxy; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\ThreeGoalsOnePageview; +use Piwik\Tests\Fixtures\ThreeGoalsOnePageview; /** * This tests the output of the API plugin API diff --git a/tests/PHPUnit/System/ApiGetReportMetadataYearTest.php b/tests/PHPUnit/System/ApiGetReportMetadataYearTest.php index 988419f717..78edafbb19 100755 --- a/tests/PHPUnit/System/ApiGetReportMetadataYearTest.php +++ b/tests/PHPUnit/System/ApiGetReportMetadataYearTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\InvalidVisits; +use Piwik\Tests\Fixtures\InvalidVisits; /** * test the Yearly metadata API response, diff --git a/tests/PHPUnit/System/ArchiveCronTest.php b/tests/PHPUnit/System/ArchiveCronTest.php index 768ded9892..3d328a3927 100644 --- a/tests/PHPUnit/System/ArchiveCronTest.php +++ b/tests/PHPUnit/System/ArchiveCronTest.php @@ -10,7 +10,7 @@ namespace Piwik\Tests\System; use Piwik\Date; use Piwik\Plugins\SitesManager\API; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\ManySitesImportedLogs; +use Piwik\Tests\Fixtures\ManySitesImportedLogs; use Piwik\Tests\Impl\Fixture; use Exception; diff --git a/tests/PHPUnit/System/ArchiveInvalidationTest.php b/tests/PHPUnit/System/ArchiveInvalidationTest.php index 3715014525..1a0d1dff38 100644 --- a/tests/PHPUnit/System/ArchiveInvalidationTest.php +++ b/tests/PHPUnit/System/ArchiveInvalidationTest.php @@ -9,7 +9,7 @@ namespace Piwik\Tests\System; use Piwik\API\Request; use Piwik\Config; -use Piwik\Tests\Impl\Fixtures\VisitsTwoWebsitesWithAdditionalVisits; +use Piwik\Tests\Fixtures\VisitsTwoWebsitesWithAdditionalVisits; use Piwik\Tests\Impl\SystemTestCase; /** diff --git a/tests/PHPUnit/System/ArchiveWebTest.php b/tests/PHPUnit/System/ArchiveWebTest.php index 8d47fb7204..610c83de45 100644 --- a/tests/PHPUnit/System/ArchiveWebTest.php +++ b/tests/PHPUnit/System/ArchiveWebTest.php @@ -10,7 +10,7 @@ namespace Piwik\Tests\System; use Piwik\Option; use Piwik\Http; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\ManySitesImportedLogs; +use Piwik\Tests\Fixtures\ManySitesImportedLogs; use Piwik\Tests\Impl\Fixture; use Exception; diff --git a/tests/PHPUnit/System/AutoSuggestAPITest.php b/tests/PHPUnit/System/AutoSuggestAPITest.php index d35a273da8..f86e6b869c 100644 --- a/tests/PHPUnit/System/AutoSuggestAPITest.php +++ b/tests/PHPUnit/System/AutoSuggestAPITest.php @@ -10,7 +10,7 @@ namespace Piwik\Tests\System; use Piwik\API\Request; use Piwik\Date; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\ManyVisitsWithGeoIP; +use Piwik\Tests\Fixtures\ManyVisitsWithGeoIP; use Piwik\Tests\Impl\Fixture; /** diff --git a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php index 2b2a616ada..5b27b2e279 100644 --- a/tests/PHPUnit/System/BackwardsCompatibility1XTest.php +++ b/tests/PHPUnit/System/BackwardsCompatibility1XTest.php @@ -11,7 +11,7 @@ use Piwik\Common; use Piwik\Db; use Piwik\Plugins\VisitFrequency\API as VisitFrequencyApi; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\SqlDump; +use Piwik\Tests\Fixtures\SqlDump; use Piwik\Tests\Impl\Fixture; /** diff --git a/tests/PHPUnit/System/BlobReportLimitingTest.php b/tests/PHPUnit/System/BlobReportLimitingTest.php index 56a3a0126d..f38ee05da7 100755 --- a/tests/PHPUnit/System/BlobReportLimitingTest.php +++ b/tests/PHPUnit/System/BlobReportLimitingTest.php @@ -10,7 +10,7 @@ namespace Piwik\Tests\System; use Piwik\Config; use Piwik\Plugins\Actions\ArchivingHelper; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\ManyVisitsWithMockLocationProvider; +use Piwik\Tests\Fixtures\ManyVisitsWithMockLocationProvider; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php'; diff --git a/tests/PHPUnit/System/CsvExportTest.php b/tests/PHPUnit/System/CsvExportTest.php index 4533afc943..2069b70cd4 100755 --- a/tests/PHPUnit/System/CsvExportTest.php +++ b/tests/PHPUnit/System/CsvExportTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoVisitsWithCustomVariables; +use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; /** * Test CSV export with Expanded rows, Translated labels, Different languages diff --git a/tests/PHPUnit/System/CustomEventsTest.php b/tests/PHPUnit/System/CustomEventsTest.php index 6df0f5a642..1560a91b21 100644 --- a/tests/PHPUnit/System/CustomEventsTest.php +++ b/tests/PHPUnit/System/CustomEventsTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoVisitsWithCustomEvents; +use Piwik\Tests\Fixtures\TwoVisitsWithCustomEvents; /** * Testing Custom Events diff --git a/tests/PHPUnit/System/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/System/EcommerceOrderWithItemsTest.php index 1dbf092166..0cf6423a8d 100755 --- a/tests/PHPUnit/System/EcommerceOrderWithItemsTest.php +++ b/tests/PHPUnit/System/EcommerceOrderWithItemsTest.php @@ -10,7 +10,7 @@ namespace Piwik\Tests\System; use Piwik\Date; use Piwik\Piwik; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoSitesEcommerceOrderWithItems; +use Piwik\Tests\Fixtures\TwoSitesEcommerceOrderWithItems; /** * Tests API methods after ecommerce orders are tracked. diff --git a/tests/PHPUnit/System/FlattenReportsTest.php b/tests/PHPUnit/System/FlattenReportsTest.php index 46787d1da9..046bdb8d3d 100644 --- a/tests/PHPUnit/System/FlattenReportsTest.php +++ b/tests/PHPUnit/System/FlattenReportsTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\ManyVisitsWithSubDirReferrersAndCustomVars; +use Piwik\Tests\Fixtures\ManyVisitsWithSubDirReferrersAndCustomVars; /** * Tests the flattening of reports. diff --git a/tests/PHPUnit/System/ImportLogsTest.php b/tests/PHPUnit/System/ImportLogsTest.php index 9d52c6a112..9dcbbd2a1d 100755 --- a/tests/PHPUnit/System/ImportLogsTest.php +++ b/tests/PHPUnit/System/ImportLogsTest.php @@ -10,7 +10,7 @@ namespace Piwik\Tests\System; use Piwik\Access; use Piwik\Plugins\SitesManager\API; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\ManySitesImportedLogs; +use Piwik\Tests\Fixtures\ManySitesImportedLogs; /** * Tests the log importer. diff --git a/tests/PHPUnit/System/LabelFilterTest.php b/tests/PHPUnit/System/LabelFilterTest.php index 5493a05e29..d58f42bc4c 100644 --- a/tests/PHPUnit/System/LabelFilterTest.php +++ b/tests/PHPUnit/System/LabelFilterTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\OneVisitSeveralPageViews; +use Piwik\Tests\Fixtures\OneVisitSeveralPageViews; /** * Tests the class LabelFilter. diff --git a/tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php b/tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php index 2cf094b92f..72994a3f16 100755 --- a/tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php +++ b/tests/PHPUnit/System/ManyVisitorsOneWebsiteTest.php @@ -11,7 +11,7 @@ require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockLocationProvider.php'; use Piwik\Date; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\ManyVisitsWithGeoIP; +use Piwik\Tests\Fixtures\ManyVisitsWithGeoIP; /** * Tests w/ 14 visitors w/ 2 visits each. diff --git a/tests/PHPUnit/System/MultipleSitesArchivingTest.php b/tests/PHPUnit/System/MultipleSitesArchivingTest.php index 436ceaa50e..25a1c1569c 100644 --- a/tests/PHPUnit/System/MultipleSitesArchivingTest.php +++ b/tests/PHPUnit/System/MultipleSitesArchivingTest.php @@ -10,7 +10,7 @@ namespace Piwik\Tests\System; use Piwik\Config; use Piwik\Piwik; use Piwik\Tests\Impl\Fixture; -use Piwik\Tests\Impl\Fixtures\ThreeSitesWithSharedVisitors; +use Piwik\Tests\Fixtures\ThreeSitesWithSharedVisitors; use Piwik\Tests\Impl\SystemTestCase; /** diff --git a/tests/PHPUnit/System/NoVisitTest.php b/tests/PHPUnit/System/NoVisitTest.php index 45f2b6ed06..a9851358bf 100755 --- a/tests/PHPUnit/System/NoVisitTest.php +++ b/tests/PHPUnit/System/NoVisitTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\InvalidVisits; +use Piwik\Tests\Fixtures\InvalidVisits; /** * testing various wrong Tracker requests and check that they behave as expected: diff --git a/tests/PHPUnit/System/NonUnicodeTest.php b/tests/PHPUnit/System/NonUnicodeTest.php index 943940ac43..5bcbfe1dd0 100755 --- a/tests/PHPUnit/System/NonUnicodeTest.php +++ b/tests/PHPUnit/System/NonUnicodeTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\SomeVisitsWithNonUnicodePageTitles; +use Piwik\Tests\Fixtures\SomeVisitsWithNonUnicodePageTitles; /** * Tests that visits track & reports display correctly when non-unicode text is diff --git a/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php b/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php index 4d72a31c8a..5ec5f22d4a 100644 --- a/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php +++ b/tests/PHPUnit/System/OneVisitorLongUrlsTruncatedTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\SomeVisitsWithLongUrls; +use Piwik\Tests\Fixtures\SomeVisitsWithLongUrls; /** * Tests that filter_truncate works recursively in Page URLs report AND in the case there are 2 different data Keywords -> search engine diff --git a/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php b/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php index eb5bec6de3..23d418b0ad 100755 --- a/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php +++ b/tests/PHPUnit/System/OneVisitorNoKeywordSpecifiedTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoVisitsNoKeywordWithBot; +use Piwik\Tests\Fixtures\TwoVisitsNoKeywordWithBot; /** * 1) Tests empty google kwd works nicely in Live! output and Top keywords diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php index 7cd7b9f632..85dcb87673 100755 --- a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php +++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php @@ -11,7 +11,7 @@ use Piwik\Common; use Piwik\Db; use Piwik\Piwik; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\VisitsOverSeveralDays; +use Piwik\Tests\Fixtures\VisitsOverSeveralDays; /** * Tests some API using range periods & makes sure the correct amount of blob/numeric diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php index f7ea478466..82629f69ec 100755 --- a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php +++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\VisitsOverSeveralDays; +use Piwik\Tests\Fixtures\VisitsOverSeveralDays; /** * Use case testing various important features: diff --git a/tests/PHPUnit/System/OneVisitorSeveralDaysImportedInRandomOrderTest.php b/tests/PHPUnit/System/OneVisitorSeveralDaysImportedInRandomOrderTest.php index 0d13a6a246..de66f3289b 100644 --- a/tests/PHPUnit/System/OneVisitorSeveralDaysImportedInRandomOrderTest.php +++ b/tests/PHPUnit/System/OneVisitorSeveralDaysImportedInRandomOrderTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\VisitOverSeveralDaysImportedLogs; +use Piwik\Tests\Fixtures\VisitOverSeveralDaysImportedLogs; /** * @group Core diff --git a/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php index 94a7a3e307..a3b25892ef 100755 --- a/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php +++ b/tests/PHPUnit/System/OneVisitorTwoVisitsTest.php @@ -10,7 +10,7 @@ namespace Piwik\Tests\System; use Piwik\API\Proxy; use Piwik\Archive; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\OneVisitorTwoVisits; +use Piwik\Tests\Fixtures\OneVisitorTwoVisits; use Exception; /** diff --git a/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php b/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php index 206ee08276..966382045d 100755 --- a/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php +++ b/tests/PHPUnit/System/OneVisitorTwoVisitsWithCookieSupportTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\OneVisitorTwoVisits; +use Piwik\Tests\Fixtures\OneVisitorTwoVisits; /** * Same as OneVisitorTwoVisits.test.php, but with cookie support, which incurs some slight changes diff --git a/tests/PHPUnit/System/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php b/tests/PHPUnit/System/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php index 92da5acaa6..92f1a8bb4a 100755 --- a/tests/PHPUnit/System/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php +++ b/tests/PHPUnit/System/PeriodIsRangeDateIsLastNMetadataAndNormalAPITest.php @@ -9,7 +9,7 @@ namespace Piwik\Tests\System; use Piwik\Date; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoVisitsWithCustomVariables; +use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; /** * test Metadata API + period=range&date=lastN diff --git a/tests/PHPUnit/System/PivotByQueryParamTest.php b/tests/PHPUnit/System/PivotByQueryParamTest.php index 88829fec0a..cfe630d9d5 100644 --- a/tests/PHPUnit/System/PivotByQueryParamTest.php +++ b/tests/PHPUnit/System/PivotByQueryParamTest.php @@ -9,7 +9,7 @@ namespace Piwik\Tests\System; use Piwik\Config; use Piwik\Date; -use Piwik\Tests\Impl\Fixtures\ManyVisitsWithMockLocationProvider; +use Piwik\Tests\Fixtures\ManyVisitsWithMockLocationProvider; use Piwik\Tests\Impl\SystemTestCase; /** diff --git a/tests/PHPUnit/System/PurgeDataTest.php b/tests/PHPUnit/System/PurgeDataTest.php index c8715cd93e..3e1d8f4b53 100755 --- a/tests/PHPUnit/System/PurgeDataTest.php +++ b/tests/PHPUnit/System/PurgeDataTest.php @@ -13,7 +13,7 @@ use Piwik\API\Request; use Piwik\Plugins\PrivacyManager\PrivacyManager; use Piwik\Plugins\PrivacyManager\ReportsPurger; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\OneVisitorTwoVisits; +use Piwik\Tests\Fixtures\OneVisitorTwoVisits; /** * TODO: shouldn't this be merged w/ PrivacyManagerTest? the original data purging tests are there diff --git a/tests/PHPUnit/System/RowEvolutionTest.php b/tests/PHPUnit/System/RowEvolutionTest.php index 3fa1d9596b..e70379279f 100755 --- a/tests/PHPUnit/System/RowEvolutionTest.php +++ b/tests/PHPUnit/System/RowEvolutionTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers; +use Piwik\Tests\Fixtures\TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers; /** * Tests the method API.getRowEvolution diff --git a/tests/PHPUnit/System/SiteSearchTest.php b/tests/PHPUnit/System/SiteSearchTest.php index 4d6867ed53..653d361951 100755 --- a/tests/PHPUnit/System/SiteSearchTest.php +++ b/tests/PHPUnit/System/SiteSearchTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\ThreeSitesWithManyVisitsWithSiteSearch; +use Piwik\Tests\Fixtures\ThreeSitesWithManyVisitsWithSiteSearch; /** * Testing the various use cases w/ internal Site Search tracking diff --git a/tests/PHPUnit/System/TimezonesTest.php b/tests/PHPUnit/System/TimezonesTest.php index a071ded41b..952f045c16 100644 --- a/tests/PHPUnit/System/TimezonesTest.php +++ b/tests/PHPUnit/System/TimezonesTest.php @@ -9,7 +9,7 @@ namespace Piwik\Tests\System; use Piwik\Date; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\VisitsInDifferentTimezones; +use Piwik\Tests\Fixtures\VisitsInDifferentTimezones; /** * Test reports using visits for a site with a non-UTC timezone. diff --git a/tests/PHPUnit/System/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php b/tests/PHPUnit/System/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php index 30b205d9eb..95da206c6a 100755 --- a/tests/PHPUnit/System/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php +++ b/tests/PHPUnit/System/TrackCustomVariablesAndCampaignsForceUsingVisitIdNotHeuristicsTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\SomeVisitsCustomVariablesCampaignsNotHeuristics; +use Piwik\Tests\Fixtures\SomeVisitsCustomVariablesCampaignsNotHeuristics; /** * Test tracker & API when forcing the use of visit ID instead of heuristics. Also diff --git a/tests/PHPUnit/System/TrackGoalsAllowMultipleConversionsPerVisitTest.php b/tests/PHPUnit/System/TrackGoalsAllowMultipleConversionsPerVisitTest.php index 151db2bfa2..ab345bee35 100755 --- a/tests/PHPUnit/System/TrackGoalsAllowMultipleConversionsPerVisitTest.php +++ b/tests/PHPUnit/System/TrackGoalsAllowMultipleConversionsPerVisitTest.php @@ -9,7 +9,7 @@ namespace Piwik\Tests\System; use Piwik\Plugins\Goals\API; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\SomeVisitsAllConversions; +use Piwik\Tests\Fixtures\SomeVisitsAllConversions; /** * Tests API methods with goals that do and don't allow multiple diff --git a/tests/PHPUnit/System/TrackerWindowLookBackTest.php b/tests/PHPUnit/System/TrackerWindowLookBackTest.php index 7e84f1c30a..aa908ab316 100644 --- a/tests/PHPUnit/System/TrackerWindowLookBackTest.php +++ b/tests/PHPUnit/System/TrackerWindowLookBackTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\VisitsOverSeveralDays; +use Piwik\Tests\Fixtures\VisitsOverSeveralDays; /** * Testing that, when using window_look_back_for_visitor with a high value, diff --git a/tests/PHPUnit/System/TransitionsTest.php b/tests/PHPUnit/System/TransitionsTest.php index d3c456f478..fc0549bdbf 100644 --- a/tests/PHPUnit/System/TransitionsTest.php +++ b/tests/PHPUnit/System/TransitionsTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\SomeVisitsManyPageviewsWithTransitions; +use Piwik\Tests\Fixtures\SomeVisitsManyPageviewsWithTransitions; /** * Tests the transitions plugin. diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php index 4797cf15fe..4755756614 100755 --- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php +++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysArchivingDisabledTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoSitesTwoVisitorsDifferentDays; +use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays; /** * Tests IndexedBySite optimizations when archiving is disabled. diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php index c65ca94c7d..8c64abce71 100755 --- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php +++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php @@ -9,7 +9,7 @@ namespace Piwik\Tests\System; use Piwik\Plugins\Goals\Archiver; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoSitesTwoVisitorsDifferentDays; +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 cbde5332e8..495ada90aa 100755 --- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php +++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoSitesTwoVisitorsDifferentDays; +use Piwik\Tests\Fixtures\TwoSitesTwoVisitorsDifferentDays; /** * tests Tracker several websites, different days. diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentContainsTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentContainsTest.php index 1fc3f60e6d..b2d85a893b 100755 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentContainsTest.php +++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentContainsTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoVisitsWithCustomVariables; +use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; /** * Tests use of custom variable segments. diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php index f273d84fa7..e0f579782f 100755 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php +++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchALLNoGoalDataTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoVisitsWithCustomVariables; +use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; /** * @group Plugins diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php index 42eba9b348..1aa078b5b1 100755 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php +++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchNONETest.php @@ -9,7 +9,7 @@ namespace Piwik\Tests\System; use Piwik\Plugins\API\API; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoVisitsWithCustomVariables; +use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; use Piwik\Tests\Impl\Fixture; /** diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php index 7a2e98a320..01a5005278 100755 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php +++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesSegmentMatchVisitorTypeTest.php @@ -10,7 +10,7 @@ namespace Piwik\Tests\System; use Piwik\Common; use Piwik\Db; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoVisitsWithCustomVariables; +use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; /** * Tests use of custom variable segments. diff --git a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesTest.php b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesTest.php index 77b7f97caf..7bc80d3ade 100755 --- a/tests/PHPUnit/System/TwoVisitsWithCustomVariablesTest.php +++ b/tests/PHPUnit/System/TwoVisitsWithCustomVariablesTest.php @@ -8,7 +8,7 @@ namespace Piwik\Tests\System; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoVisitsWithCustomVariables; +use Piwik\Tests\Fixtures\TwoVisitsWithCustomVariables; /** * Tests w/ two visits & custom variables. diff --git a/tests/PHPUnit/System/UrlNormalizationTest.php b/tests/PHPUnit/System/UrlNormalizationTest.php index f8b3a71ce3..a91a01aad0 100644 --- a/tests/PHPUnit/System/UrlNormalizationTest.php +++ b/tests/PHPUnit/System/UrlNormalizationTest.php @@ -11,7 +11,7 @@ use Piwik\Common; use Piwik\Db; use Piwik\Tracker\Action; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\OneVisitWithAbnormalPageviewUrls; +use Piwik\Tests\Fixtures\OneVisitWithAbnormalPageviewUrls; /** * Tests the URL normalization. diff --git a/tests/PHPUnit/System/UserIdAndVisitorIdTest.php b/tests/PHPUnit/System/UserIdAndVisitorIdTest.php index 64979af52c..4bc0700c08 100644 --- a/tests/PHPUnit/System/UserIdAndVisitorIdTest.php +++ b/tests/PHPUnit/System/UserIdAndVisitorIdTest.php @@ -9,7 +9,7 @@ namespace Piwik\Tests\System; use Piwik\API\Proxy; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\FewVisitsWithSetVisitorId; +use Piwik\Tests\Fixtures\FewVisitsWithSetVisitorId; /** * This test tests that when using &cid=, the visitor ID is enforced diff --git a/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php b/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php index bb609d6bee..d958dcc894 100644 --- a/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php +++ b/tests/PHPUnit/System/VisitsInPastInvalidateOldReportsTest.php @@ -9,7 +9,7 @@ namespace Piwik\Tests\System; use Piwik\API\Request; use Piwik\Tests\Impl\SystemTestCase; -use Piwik\Tests\Impl\Fixtures\TwoSitesVisitsInPast; +use Piwik\Tests\Fixtures\TwoSitesVisitsInPast; use Exception; /** |