diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-10-15 06:20:20 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-10-15 06:20:20 +0400 |
| commit | 623b63e72d3494969e1284d7fc78da92b18725c3 (patch) | |
| tree | b1cb65d2984a219cb8bf9b41b9608d644563f3bf /tests/PHPUnit | |
| parent | 597ba5665a9c2b2d4a5bf0bfacc7476086844443 (diff) | |
Cleaning up @group comments on tests to keep only 4 groups: Core, Integration, Plugins and UI
Diffstat (limited to 'tests/PHPUnit')
125 files changed, 123 insertions, 1120 deletions
diff --git a/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php b/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php index 2dcdbbec18..2d25e7d286 100644 --- a/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php +++ b/tests/PHPUnit/Benchmarks/ArchiveQueryBenchmark.php @@ -32,7 +32,6 @@ class ArchiveQueryBenchmark extends BenchmarkTestCase /** * @group Benchmarks - * @group ArchivingProcess */ public function testArchivingProcess() { diff --git a/tests/PHPUnit/Benchmarks/ArchivingProcessBenchmark.php b/tests/PHPUnit/Benchmarks/ArchivingProcessBenchmark.php index 294ec73a12..85300320f6 100755 --- a/tests/PHPUnit/Benchmarks/ArchivingProcessBenchmark.php +++ b/tests/PHPUnit/Benchmarks/ArchivingProcessBenchmark.php @@ -21,7 +21,6 @@ class ArchivingProcessBenchmark extends BenchmarkTestCase /** * @group Benchmarks - * @group ArchivingProcess */ public function testArchivingProcess() { diff --git a/tests/PHPUnit/Benchmarks/MultiSitesBenchmark.php b/tests/PHPUnit/Benchmarks/MultiSitesBenchmark.php index 5da91e062b..f0f0266074 100644 --- a/tests/PHPUnit/Benchmarks/MultiSitesBenchmark.php +++ b/tests/PHPUnit/Benchmarks/MultiSitesBenchmark.php @@ -31,7 +31,6 @@ class MultiSitesBenchmark extends BenchmarkTestCase /** * @group Benchmarks - * @group ArchivingProcess */ public function testArchivingProcess() { diff --git a/tests/PHPUnit/Benchmarks/TrackerBenchmark.php b/tests/PHPUnit/Benchmarks/TrackerBenchmark.php index 2203fe6655..4737988c53 100755 --- a/tests/PHPUnit/Benchmarks/TrackerBenchmark.php +++ b/tests/PHPUnit/Benchmarks/TrackerBenchmark.php @@ -65,7 +65,6 @@ class TrackerBenchmark extends BenchmarkTestCase /** * @group Benchmarks - * @group TrackerBenchmark */ public function testTracker() { diff --git a/tests/PHPUnit/Core/API/ResponseBuilderTest.php b/tests/PHPUnit/Core/API/ResponseBuilderTest.php index eda4b553fd..9f8b886af6 100644 --- a/tests/PHPUnit/Core/API/ResponseBuilderTest.php +++ b/tests/PHPUnit/Core/API/ResponseBuilderTest.php @@ -13,8 +13,6 @@ class API_ResponseBuilderTest extends PHPUnit_Framework_TestCase * Two dimensions standard array * * @group Core - * @group API - * @group API_ResponseBuilder */ public function testConvertMultiDimensionalStandardArrayToJson() { @@ -34,8 +32,6 @@ class API_ResponseBuilderTest extends PHPUnit_Framework_TestCase * Two dimensions associative array * * @group Core - * @group API - * @group API_ResponseBuilder */ public function testConvertMultiDimensionalAssociativeArrayToJson() { @@ -56,8 +52,6 @@ class API_ResponseBuilderTest extends PHPUnit_Framework_TestCase * Two dimensions mixed array * * @group Core - * @group API - * @group API_ResponseBuilder */ public function testConvertMultiDimensionalMixedArrayToJson() { diff --git a/tests/PHPUnit/Core/AccessTest.php b/tests/PHPUnit/Core/AccessTest.php index 7740d1650c..7688bddbb2 100644 --- a/tests/PHPUnit/Core/AccessTest.php +++ b/tests/PHPUnit/Core/AccessTest.php @@ -18,7 +18,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testGetListAccess() { @@ -29,7 +28,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testGetTokenAuthWithEmptyAccess() { @@ -39,7 +37,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testGetLoginWithEmptyAccess() { @@ -49,7 +46,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testIsSuperUserWithEmptyAccess() { @@ -59,7 +55,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testIsSuperUserWithSuperUserAccess() { @@ -70,7 +65,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testIsSuperUserWithNoSuperUserAccess() { @@ -81,7 +75,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testGetSitesIdWithAtLeastViewAccessWithEmptyAccess() { @@ -91,7 +84,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testGetSitesIdWithAdminAccessWithEmptyAccess() { @@ -101,7 +93,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testGetSitesIdWithViewAccessWithEmptyAccess() { @@ -111,7 +102,7 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access + * * @expectedException Piwik\NoAccessException */ public function testCheckUserIsSuperUserWithEmptyAccess() @@ -122,7 +113,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testCheckUserIsSuperUserWithSuperUserAccess() { @@ -133,7 +123,7 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access + * * @expectedException Piwik\NoAccessException */ public function testCheckUserHasSomeAdminAccessWithEmptyAccess() @@ -144,7 +134,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testCheckUserHasSomeAdminAccessWithSuperUserAccess() { @@ -155,7 +144,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testCheckUserHasSomeAdminAccessWithSomeAccess() { @@ -173,7 +161,7 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access + * * @expectedException Piwik\NoAccessException */ public function testCheckUserHasSomeViewAccessWithEmptyAccess() @@ -184,7 +172,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testCheckUserHasSomeViewAccessWithSuperUserAccess() { @@ -195,7 +182,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testCheckUserHasSomeViewAccessWithSomeAccess() { @@ -213,7 +199,7 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access + * * @expectedException Piwik\NoAccessException */ public function testCheckUserHasViewAccessWithEmptyAccessNoSiteIdsGiven() @@ -224,7 +210,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testCheckUserHasViewAccessWithSuperUserAccess() { @@ -235,7 +220,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testCheckUserHasViewAccessWithSomeAccessSuccessIdSitesAsString() { @@ -253,7 +237,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testCheckUserHasViewAccessWithSomeAccessSuccessAllSites() { @@ -271,7 +254,7 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access + * * @expectedException Piwik\NoAccessException */ public function testCheckUserHasViewAccessWithSomeAccessFailure() @@ -290,7 +273,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testCheckUserHasAdminAccessWithSuperUserAccess() { @@ -301,7 +283,7 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access + * * @expectedException Piwik\NoAccessException */ public function testCheckUserHasAdminAccessWithEmptyAccessNoSiteIdsGiven() @@ -312,7 +294,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testCheckUserHasAdminAccessWithSomeAccessSuccessIdSitesAsString() { @@ -330,7 +311,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testCheckUserHasAdminAccessWithSomeAccessSuccessAllSites() { @@ -352,7 +332,7 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access + * * @expectedException Piwik\NoAccessException */ public function testCheckUserHasAdminAccessWithSomeAccessFailure() @@ -371,7 +351,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testReloadAccessWithEmptyAuth() { @@ -381,7 +360,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testReloadAccessWithEmptyAuthSuperUser() { @@ -392,7 +370,6 @@ class AccessTest extends DatabaseTestCase /** * @group Core - * @group Access */ public function testReloadAccessWithMockedAuthValid() { diff --git a/tests/PHPUnit/Core/ArchiveProcessingTest.php b/tests/PHPUnit/Core/ArchiveProcessingTest.php index 99f9b17434..93f8581fb9 100644 --- a/tests/PHPUnit/Core/ArchiveProcessingTest.php +++ b/tests/PHPUnit/Core/ArchiveProcessingTest.php @@ -81,7 +81,6 @@ class ArchiveProcessingTest extends DatabaseTestCase /** * test of validity of an archive, for a month not finished * @group Core - * @group ArchiveProcessor */ public function testInitCurrentMonth() { @@ -115,7 +114,6 @@ class ArchiveProcessingTest extends DatabaseTestCase /** * test of validity of an archive, for a month in the past * @group Core - * @group ArchiveProcessor */ public function testInitDayInPast() { @@ -133,7 +131,6 @@ class ArchiveProcessingTest extends DatabaseTestCase /** * test of validity of an archive, for a non UTC date in the past * @group Core - * @group ArchiveProcessor */ public function testInitDayInPastNonUTCWebsite() { @@ -151,7 +148,6 @@ class ArchiveProcessingTest extends DatabaseTestCase /** * test of validity of an archive, for a non UTC month in the past * @group Core - * @group ArchiveProcessor */ public function testInitMonthInPastNonUTCWebsite() { @@ -169,7 +165,6 @@ class ArchiveProcessingTest extends DatabaseTestCase /** * test of validity of an archive, for today's archive * @group Core - * @group ArchiveProcessor */ public function testInitToday() { @@ -207,7 +202,6 @@ class ArchiveProcessingTest extends DatabaseTestCase /** * test of validity of an archive, for today's archive with european timezone * @group Core - * @group ArchiveProcessor */ public function testInitTodayEurope() { @@ -254,7 +248,6 @@ class ArchiveProcessingTest extends DatabaseTestCase /** * test of validity of an archive, for today's archive with toronto's timezone * @group Core - * @group ArchiveProcessor */ public function testInitTodayToronto() { @@ -300,7 +293,6 @@ class ArchiveProcessingTest extends DatabaseTestCase /** * Testing batch insert * @group Core - * @group ArchiveProcessor */ public function testTableInsertBatch() { @@ -352,7 +344,6 @@ class ArchiveProcessingTest extends DatabaseTestCase /** * Testing plain inserts * @group Core - * @group ArchiveProcessor */ public function testTableInsertBatchIterate() { @@ -376,7 +367,6 @@ class ArchiveProcessingTest extends DatabaseTestCase /** * Testing batch insert (BLOB) * @group Core - * @group ArchiveProcessor */ public function testTableInsertBatchBlob() { @@ -409,7 +399,6 @@ class ArchiveProcessingTest extends DatabaseTestCase /** * Testing plain inserts (BLOB) * @group Core - * @group ArchiveProcessor */ public function testTableInsertBatchIterateBlob() { diff --git a/tests/PHPUnit/Core/AssetManagerTest.php b/tests/PHPUnit/Core/AssetManagerTest.php index 84d2f0d330..21c061c028 100644 --- a/tests/PHPUnit/Core/AssetManagerTest.php +++ b/tests/PHPUnit/Core/AssetManagerTest.php @@ -11,7 +11,6 @@ class AssetManagerTest extends PHPUnit_Framework_TestCase { /** * @group Core - * @group AssetManager */ public function testPrioritySort() { diff --git a/tests/PHPUnit/Core/CommonTest.php b/tests/PHPUnit/Core/CommonTest.php index 2d3fdb1acf..ad8647ab71 100644 --- a/tests/PHPUnit/Core/CommonTest.php +++ b/tests/PHPUnit/Core/CommonTest.php @@ -41,8 +41,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @dataProvider getUrls * @group Core - * @group Common - * @group isLookLikeUrl */ public function testIsUrl($url, $isValid) { @@ -128,8 +126,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @dataProvider getInputValues * @group Core - * @group Common - * @group sanitizeInputValues */ public function testSanitizeInputValues($input, $output) { @@ -147,8 +143,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * emptyvarname => exception * @group Core - * @group Common - * @group getRequestVar */ public function testGetRequestVarEmptyVarName() { @@ -164,8 +158,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * nodefault Notype Novalue => exception * @group Core - * @group Common - * @group getRequestVar */ public function testGetRequestVarNoDefaultNoTypeNoValue() { @@ -180,8 +172,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * nodefault Notype WithValue => value * @group Core - * @group Common - * @group getRequestVar */ public function testGetRequestVarNoDefaultNoTypeWithValue() { @@ -193,8 +183,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * nodefault Withtype WithValue => exception cos type not matching * @group Core - * @group Common - * @group getRequestVar */ public function testGetRequestVarNoDefaultWithTypeWithValue() { @@ -210,8 +198,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * nodefault Withtype WithValue => exception cos type not matching * @group Core - * @group Common - * @group getRequestVar */ public function testGetRequestVarNoDefaultWithTypeWithValue2() { @@ -264,8 +250,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @dataProvider getRequestVarValues * @group Core - * @group Common - * @group getRequestVar */ public function testGetRequestVar($varValue, $default, $type, $expected) { @@ -337,8 +321,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @dataProvider getQueryStrings * @group Core - * @group Common - * @group getParameterFromQueryString */ public function testGetParameterFromQueryString($queryString, $parameter, $expected) { @@ -347,8 +329,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Common - * @group getPathAndQueryFromUrl */ public function testGetPathAndQueryFromUrl() { @@ -357,8 +337,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Common - * @group getArrayFromQueryString */ public function testGetArrayFromQueryString() { @@ -376,8 +354,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Common - * @group isValidFilename */ public function testIsValidFilenameValidValues() { @@ -394,8 +370,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Common - * @group isValidFilename */ public function testIsValidFilenameNotValidValues() { @@ -454,8 +428,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @dataProvider getBrowserLanguageData * @group Core - * @group Common - * @group getBrowserLanguage */ public function testGetBrowserLanguage($useragent, $browserLanguage) { @@ -488,8 +460,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @dataProvider getCountryCodeTestData * @group Core - * @group Common - * @group extractCountryCodeFromBrowserLanguage */ public function testExtractCountryCodeFromBrowserLanguage($browserLanguage, $validCountries, $expected) { @@ -516,8 +486,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @dataProvider getCountryCodeTestDataInfer * @group Core - * @group Common - * @group extractCountryCodeFromBrowserLanguage */ public function testExtractCountryCodeFromBrowserLanguageInfer($browserLanguage, $validCountries, $expected, $expectedInfer) { @@ -557,8 +525,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @dataProvider getLanguageDataToExtract * @group Core - * @group Common - * @group extractLanguageCodeFromBrowserLanguage */ public function testExtractLanguageCodeFromBrowserLanguage($browserLanguage, $validLanguages, $expected) { @@ -567,7 +533,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Common */ public function testSearchEnginesDefinedCorrectly() { @@ -614,8 +579,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @dataProvider getSearchEngineUrls * @group Core - * @group Common - * @group extractSearchEngineInformationFromUrl */ public function testExtractSearchEngineInformationFromUrl($url, $engine, $keywords) { @@ -653,8 +616,6 @@ class Core_CommonTest extends PHPUnit_Framework_TestCase /** * @dataProvider getLossyUrls * @group Core - * @group Common - * @group getLossyUrl */ public function testGetLossyUrl($input, $expected) { diff --git a/tests/PHPUnit/Core/ConfigTest.php b/tests/PHPUnit/Core/ConfigTest.php index 0922c7a20e..0b68e0a7d6 100644 --- a/tests/PHPUnit/Core/ConfigTest.php +++ b/tests/PHPUnit/Core/ConfigTest.php @@ -11,7 +11,6 @@ class ConfigTest extends PHPUnit_Framework_TestCase { /** * @group Core - * @group Config */ public function testUserConfigOverwritesSectionGlobalConfigValue() { @@ -39,7 +38,6 @@ class ConfigTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Config */ public function testWritingConfigWithSpecialCharacters() { @@ -70,7 +68,6 @@ class ConfigTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Config */ public function testUserConfigOverwritesGlobalConfig() { @@ -132,7 +129,7 @@ class ConfigTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Config + * * @dataProvider getCompareElementsData */ public function testCompareElements($description, $test) @@ -191,7 +188,7 @@ class ConfigTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Config + * * @dataProvider getArrayUnmergeData */ public function testArrayUnmerge($description, $test) @@ -339,7 +336,7 @@ class ConfigTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Config + * * @dataProvider getDumpConfigData */ public function testDumpConfig($description, $test) diff --git a/tests/PHPUnit/Core/CookieTest.php b/tests/PHPUnit/Core/CookieTest.php index c3d622bbb6..6424af736b 100644 --- a/tests/PHPUnit/Core/CookieTest.php +++ b/tests/PHPUnit/Core/CookieTest.php @@ -36,7 +36,7 @@ class CookieTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Cookie + * * @dataProvider getJsonSerializeData */ public function testJsonSerialize($testData, $id) @@ -78,7 +78,7 @@ class CookieTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Cookie + * * @dataProvider getSafeSerializeData */ public function testSafeSerialize($id, $testData) @@ -91,7 +91,6 @@ class CookieTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Cookie */ public function testSafeUnserialize() { diff --git a/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php b/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php index 05136a1c27..07e5497285 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/AddSummaryRowTest.php @@ -12,11 +12,7 @@ use Piwik\DataTable\Row; class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase { /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_AddSummaryRow */ public function testOffsetIsCountSummaryRowShouldBeTheRow() { @@ -28,11 +24,7 @@ class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_AddSummaryRow */ public function testOffsetIsLessThanCountSummaryRowShouldBeTheSum() { @@ -47,11 +39,7 @@ class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_AddSummaryRow */ public function testOffsetIsMoreThanCountShouldNotAddSummaryRow() { @@ -63,11 +51,7 @@ class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_AddSummaryRow */ public function testWhenThereIsAlreadyASummaryRowShouldReplaceTheSummaryRow() { @@ -82,11 +66,7 @@ class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_AddSummaryRow */ public function testSumTablesWithSummaryRowShouldSumTheSummaryRow() { @@ -112,11 +92,7 @@ class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_AddSummaryRow */ public function testAddOneTableWithSummaryRow() { @@ -143,11 +119,7 @@ class DataTable_Filter_AddSummaryRowTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_AddSummaryRow */ public function testWhenRowsInRandomOrderButSortSpecifiedShouldComputeSummaryRowAfterSort() { diff --git a/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php b/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php index 084343329f..befee6e636 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/ExcludeLowPopulationTest.php @@ -28,12 +28,8 @@ class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCa } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_ExcludeLowPopulation - */ + **/ public function testStandardTable() { $table = $this->getTestDataTable(); @@ -44,12 +40,8 @@ class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCa } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_ExcludeLowPopulation - */ + **/ public function testFilterEqualOneDoesFilter() { $table = $this->getTestDataTable(); @@ -59,12 +51,8 @@ class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCa } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_ExcludeLowPopulation - */ + **/ public function testFilterEqualZeroDoesFilter() { $table = $this->getTestDataTable(); @@ -75,12 +63,8 @@ class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCa } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_ExcludeLowPopulation - */ + */ public function testFilterSpecifyExcludeLowPopulationThresholdDoesFilter() { $table = $this->getTestDataTable(); @@ -95,10 +79,7 @@ class DataTable_Filter_ExcludeLowPopulationTest extends PHPUnit_Framework_TestCa * Test to exclude low population filter * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_ExcludeLowPopulation - */ + */ public function testFilterLowpop1() { diff --git a/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php b/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php index 21d713c22e..3b786b0f01 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/LimitTest.php @@ -37,11 +37,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Limit */ public function testNormal() { @@ -57,11 +53,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Limit */ public function testLimitLessThanCountShouldReturnCountLimit() { @@ -77,11 +69,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Limit */ public function testLimitIsCountShouldNotDeleteAnything() { @@ -98,11 +86,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Limit */ public function testLimitGreaterThanCountShouldReturnCountUntilCount() { @@ -119,11 +103,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Limit */ public function testLimitIsNullShouldReturnCountIsOffset() { @@ -138,11 +118,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Limit */ public function testOffsetJustBeforeSummaryRowShouldJustReturnSummaryRow() { @@ -158,11 +134,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Limit */ public function testOffsetJustBeforeSummaryRowWithBigLimitShouldJustReturnSummaryRow() { @@ -178,11 +150,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Limit */ public function testOffsetBeforeSummaryRowShouldJustReturnRowAndSummaryRow() { @@ -198,11 +166,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Limit */ public function testOffsetGreaterThanCountShouldReturnEmptyTable() { @@ -216,11 +180,7 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Limit */ public function testLimitIsZeroShouldReturnEmptyTable() { @@ -237,9 +197,6 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase * Test to filter a table with a offset, limit * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Limit */ public function testFilterOffsetLimit() { @@ -276,9 +233,6 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase * Test to filter a column with a offset, limit off bound * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Limit */ public function testFilterOffsetLimitOffbound() { @@ -315,9 +269,6 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase * Test to filter a column with a offset, limit 2 * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Limit */ public function testFilterOffsetLimit2() { @@ -353,9 +304,6 @@ class DataTable_Filter_LimitTest extends PHPUnit_Framework_TestCase * Test to filter a column with a offset, limit 3 * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Limit */ public function testFilterOffsetLimit3() { diff --git a/tests/PHPUnit/Core/DataTable/Filter/PatternRecursiveTest.php b/tests/PHPUnit/Core/DataTable/Filter/PatternRecursiveTest.php index f9e7e0da27..0f841f718c 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/PatternRecursiveTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/PatternRecursiveTest.php @@ -60,9 +60,6 @@ class DataTable_Filter_PatternRecursiveTest extends PHPUnit_Framework_TestCase * Test to filter a column with a pattern * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_PatternRecursive * @dataProvider getTestData */ public function testFilterPattern($test) diff --git a/tests/PHPUnit/Core/DataTable/Filter/PatternTest.php b/tests/PHPUnit/Core/DataTable/Filter/PatternTest.php index b6f1893d8b..57c6178807 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/PatternTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/PatternTest.php @@ -29,9 +29,7 @@ class DataTable_Filter_PatternTest extends PHPUnit_Framework_TestCase * Test to filter a column with a pattern * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Pattern + * _Pattern * @dataProvider getTestData */ public function testFilterPattern($test) diff --git a/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php b/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php index 9a985f3b83..0119343a3b 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/RangeCheckTest.php @@ -12,11 +12,7 @@ use Piwik\DataTable\Row; class DataTable_Filter_RangeCheckTest extends PHPUnit_Framework_TestCase { /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_RangeCheck */ public function testRangeCheckNormalDataTable() { @@ -36,11 +32,7 @@ class DataTable_Filter_RangeCheckTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_RangeCheck */ public function testRangeCheckNormalDataTableNonIntegerValues() { diff --git a/tests/PHPUnit/Core/DataTable/Filter/SortTest.php b/tests/PHPUnit/Core/DataTable/Filter/SortTest.php index 204d98f432..6f18e5d8dd 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/SortTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/SortTest.php @@ -12,11 +12,7 @@ use Piwik\DataTable\Row; class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase { /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Sort */ public function testNormalSortDescending() { @@ -33,11 +29,7 @@ class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Sort */ public function testNormalSortAscending() { @@ -54,11 +46,7 @@ class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Sort */ public function testMissingColumnValuesShouldAppearLastAfterSortAsc() { @@ -78,11 +66,7 @@ class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Sort */ public function testMissingColumnValuesShouldAppearLastAfterSortDesc() { @@ -103,9 +87,6 @@ class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase * Test to sort by label * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Sort */ public function testFilterSortString() { @@ -148,9 +129,6 @@ class DataTable_Filter_SortTest extends PHPUnit_Framework_TestCase * Test to sort by visit * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Sort */ public function testFilterSortNumeric() { diff --git a/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php b/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php index 52460f93ad..48b53ea8f4 100644 --- a/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php +++ b/tests/PHPUnit/Core/DataTable/Filter/TruncateTest.php @@ -13,9 +13,6 @@ class DataTable_Filter_TruncateTest extends PHPUnit_Framework_TestCase { /** * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Truncate */ public function testUnrelatedDataTableNotFiltered() { @@ -39,11 +36,7 @@ class DataTable_Filter_TruncateTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group DataTable_Filter - * @group DataTable_Filter_Truncate */ public function testForInfiniteRecursion() { diff --git a/tests/PHPUnit/Core/DataTable/MapTest.php b/tests/PHPUnit/Core/DataTable/MapTest.php index 9840499ec3..94c3a85312 100644 --- a/tests/PHPUnit/Core/DataTable/MapTest.php +++ b/tests/PHPUnit/Core/DataTable/MapTest.php @@ -54,8 +54,6 @@ class Test_DataTable_Map extends PHPUnit_Framework_TestCase /** * Tests that Set::mergeChildren works when the DataTable\Map contains DataTables. * @group Core - * @group DataTable - * @group DataTable\Map */ public function test_MergeChildrenDataTable() { @@ -85,8 +83,6 @@ class Test_DataTable_Map extends PHPUnit_Framework_TestCase /** * Tests that Set::mergeChildren works when the DataTable\Map contains DataTable\Maps. * @group Core - * @group DataTable - * @group DataTable\Map */ public function testMergeChildrenDataTableMap() { diff --git a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php index 5888f0ad30..f5f37f2ef8 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/CSVTest.php @@ -93,9 +93,6 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_CSV */ public function testCSVTest1() { @@ -114,9 +111,6 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_CSV */ public function testCSVTest2() { @@ -131,9 +125,6 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_CSV */ public function testCSVTest3() { @@ -148,43 +139,34 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_CSV */ - public function testCSVTest4() + public function testCSVTest5() { - $dataTable = $this->_getDataTableEmpty(); + $dataTable = $this->_getDataTableSimpleOneZeroRowTest(); $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; - $expected = 'No data available'; + $expected = "value\n0"; $rendered = $render->render(); $this->assertEquals($expected, $rendered); } /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_CSV */ - public function testCSVTest5() + public function testCSVTest4() { - $dataTable = $this->_getDataTableSimpleOneZeroRowTest(); + $dataTable = $this->_getDataTableEmpty(); $render = new Csv(); $render->setTable($dataTable); $render->convertToUnicode = false; - $expected = "value\n0"; + $expected = 'No data available'; $rendered = $render->render(); $this->assertEquals($expected, $rendered); } /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_CSV */ public function testCSVTest6() { @@ -201,7 +183,6 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase * DATA OF DATATABLE_ARRAY * ------------------------- */ - protected function _getDataTableMapTest() { $array1 = array( @@ -306,9 +287,6 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_CSV */ public function testCSVMapTest1() { @@ -328,9 +306,6 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_CSV */ public function testCSVMapTest2() { @@ -346,9 +321,6 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_CSV */ public function testCSVMapTest3() { @@ -363,9 +335,6 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_CSV */ public function testCSVMapisMadeOfMapTest1() { @@ -385,9 +354,6 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_CSV */ public function testCSVMapIsMadeOfMapTest2() { @@ -403,9 +369,6 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_CSV */ public function testCSVMapIsMadeOfMapTest3() { @@ -420,9 +383,6 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testRenderArray1() { @@ -438,9 +398,6 @@ class DataTable_Renderer_CSVTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testRenderArray2() { @@ -458,9 +415,6 @@ c'; /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testRenderArray3() { @@ -477,9 +431,6 @@ b,d,f,g'; /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testRenderArray4() { diff --git a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php b/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php index ddfb556209..79107f4cf3 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/ConsoleTest.php @@ -24,9 +24,6 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase * a row with w child * * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_Console */ public function testConsole2SubLevelAnd2Different() { @@ -72,9 +69,6 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase * test with a row without child * * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_Console */ public function testConsoleSimple() { @@ -95,9 +89,6 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testRenderArray1() { @@ -113,9 +104,6 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testRenderArray2() { @@ -133,9 +121,6 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testRenderArray3() { @@ -151,9 +136,6 @@ class DataTable_Renderer_ConsoleTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testRenderArray4() { diff --git a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php b/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php index 769a9775e4..565bbb09f0 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/JSONTest.php @@ -93,9 +93,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testJSONTest1() { @@ -111,9 +108,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testJSONTest2() { @@ -127,9 +121,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testJSONTest3() { @@ -142,9 +133,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testJSONTest4() { @@ -157,9 +145,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testJSONTest5() { @@ -172,9 +157,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testJSONTest6() { @@ -295,9 +277,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testJSONArrayTest1() { @@ -312,9 +291,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testJSONMapTest2() { @@ -330,9 +306,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testJSONMapTest3() { @@ -347,9 +320,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testJSONMapIsMadeOfMapTest1() { @@ -363,9 +333,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testJSONMapIsMadeOfMapTest2() { @@ -381,9 +348,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testJSONMapIsMadeOfMapTest3() { @@ -398,9 +362,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testRenderArray1() { @@ -415,9 +376,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testRenderArray2() { @@ -432,9 +390,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testRenderArray3() { @@ -449,9 +404,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testRenderArray4() { @@ -466,9 +418,6 @@ class DataTable_Renderer_JSONTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_JSON */ public function testRenderArray5() { diff --git a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php b/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php index 2c0e57a8d3..2550876329 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/PHPTest.php @@ -93,9 +93,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_PHP */ public function testPHPTest1() { @@ -160,9 +157,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_PHP */ public function testPHPTest2() { @@ -182,9 +176,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_PHP */ public function testPHPTest3() { @@ -197,9 +188,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_PHP */ public function testPHPTest4() { @@ -212,9 +200,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_PHP */ public function testPHPTest5() { @@ -227,9 +212,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_PHP */ public function testPHPTest6() { @@ -351,9 +333,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_PHP */ public function testPHPMapTest1() { @@ -408,9 +387,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_PHP */ public function testPHPMapTest2() { @@ -438,9 +414,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_PHP */ public function testPHPMapTest3() { @@ -459,9 +432,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_PHP */ public function testPHPMapIsMadeOfMapTest1() { @@ -518,9 +488,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_PHP */ public function testPHPMapIsMadeOfMapTest2() { @@ -549,9 +516,6 @@ class DataTable_Renderer_PHPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_PHP */ public function testPHPMapIsMadeOfMapTest3() { diff --git a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php b/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php index 18c5a9beb4..99b9d20480 100644 --- a/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php +++ b/tests/PHPUnit/Core/DataTable/Renderer/XMLTest.php @@ -93,9 +93,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testXMLTest1() { @@ -155,9 +152,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testXMLTest2() { @@ -178,9 +172,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testXMLTest3() { @@ -194,9 +185,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testXMLTest4() { @@ -210,9 +198,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testXMLTest5() { @@ -226,9 +211,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testXMLTest6() { @@ -350,9 +332,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testXMLMapTest1() { @@ -400,9 +379,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testXMLArrayIsMadeOfMapTest1() { @@ -454,9 +430,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testXMLMapTest2() { @@ -481,9 +454,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testXMLArrayIsMadeOfMapTest2() { @@ -510,9 +480,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testXMLMapTest3() { @@ -532,9 +499,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testXMLArrayIsMadeOfMapTest3() { @@ -555,9 +519,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testRenderArray1() { @@ -573,9 +534,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testRenderArray2() { @@ -601,9 +559,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testRenderArray3() { @@ -626,9 +581,6 @@ class DataTable_Renderer_XMLTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group DataTable_Renderer - * @group DataTable_Renderer_XML */ public function testRenderArray4() { diff --git a/tests/PHPUnit/Core/DataTable/RowTest.php b/tests/PHPUnit/Core/DataTable/RowTest.php index 1995fc0fdd..b021e1bfe4 100644 --- a/tests/PHPUnit/Core/DataTable/RowTest.php +++ b/tests/PHPUnit/Core/DataTable/RowTest.php @@ -11,10 +11,7 @@ use Piwik\DataTable\Row; class RowTest extends PHPUnit_Framework_TestCase { /** - * * @group Core - * @group DataTable - * @group Row */ public function testDataTableAssociatedIsNegativeWhenSubDataTableInMemory() { @@ -23,10 +20,7 @@ class RowTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group Row */ public function testDataTableAssociatedIsNegativeWhenSubDataTableAdded() { @@ -36,10 +30,7 @@ class RowTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group Row */ public function testDataTableAssociatedIsNegativeWhenSubDataTableSetted() { @@ -49,10 +40,7 @@ class RowTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group Row */ public function testIdSubDataTabledIsPositiveWhenSubDataTableInMemory() { @@ -63,8 +51,6 @@ class RowTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group Row */ public function testDataTableAssociatedIsPositiveOnSerializedRow() { @@ -81,8 +67,6 @@ class RowTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable - * @group Row */ public function testDataTableAssociatedIsNegativeAfterSerialize() { @@ -96,10 +80,7 @@ class RowTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group Row */ public function testIsSubDataTableLoadedIsTrueWhenSubDataTableInMemory() { @@ -108,10 +89,7 @@ class RowTest extends PHPUnit_Framework_TestCase } /** - * * @group Core - * @group DataTable - * @group Row */ public function testIsSubDataTableLoadedIsFalseWhenSubDataTableNotInMemory() { diff --git a/tests/PHPUnit/Core/DataTableTest.php b/tests/PHPUnit/Core/DataTableTest.php index 1b761b8647..7b4b06aa18 100644 --- a/tests/PHPUnit/Core/DataTableTest.php +++ b/tests/PHPUnit/Core/DataTableTest.php @@ -16,7 +16,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase { /** * @group Core - * @group DataTable */ public function testApplyFilter() { @@ -44,7 +43,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable */ public function testRenameColumn() { @@ -57,7 +55,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable */ public function testDeleteColumn() { @@ -69,7 +66,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable */ public function testDeleteRow() { @@ -90,7 +86,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable */ public function testGetLastRow() { @@ -105,7 +100,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable */ public function testGetRowFromIdSubDataTable() { @@ -128,7 +122,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase * on a Simple array (1 level only) * * @group Core - * @group DataTable */ public function testCountRowsSimple() { @@ -159,7 +152,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase * + the number of rows in the parent table * * @group Core - * @group DataTable */ public function testCountRowsComplex() { @@ -221,7 +213,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase * Simple test of the DataTable_Row * * @group Core - * @group DataTable */ public function testRow() { @@ -247,7 +238,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase * Simple test of the DataTable_Row * * @group Core - * @group DataTable */ public function testSumRow() { @@ -302,6 +292,9 @@ class DataTableTest extends PHPUnit_Framework_TestCase $this->assertTrue(Row::isEqual($rowWanted, $finalRow)); } + /** + * @group Core + */ public function test_unserializeWorks_WhenDataTableFormatPriorPiwik2() { $serializedDatatable = ''; @@ -319,7 +312,7 @@ class DataTableTest extends PHPUnit_Framework_TestCase * Test that adding two string column values results in an exception. * * @group Core - * @group DataTable + * * @expectedException Exception */ public function testSumRow_stringException() @@ -343,7 +336,7 @@ class DataTableTest extends PHPUnit_Framework_TestCase * After 100 recursion must throw an exception * * @group Core - * @group DataTable + * * @expectedException Exception */ public function testSerializeWithInfiniteRecursion() @@ -360,7 +353,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase * Test queing filters * * @group Core - * @group DataTable */ public function testFilterQueueSortString() { @@ -418,7 +410,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase * Then we serialize everything, and we check that the unserialize give the same object back * * @group Core - * @group DataTable */ public function testGeneral() { @@ -554,7 +545,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase * add an empty datatable to a normal datatable * * @group Core - * @group DataTable */ public function testAddSimpleNoRowTable2() { @@ -569,7 +559,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase * add a normal datatable to an empty datatable * * @group Core - * @group DataTable */ public function testAddSimpleNoRowTable1() { @@ -583,7 +572,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase * add to the datatable another datatable// they don't have any row in common * * @group Core - * @group DataTable */ public function testAddSimpleNoCommonRow() { @@ -603,7 +591,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase * add 2 datatable with some common rows * * @group Core - * @group DataTable */ public function testAddSimpleSomeCommonRow() { @@ -648,7 +635,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase * add 2 datatable with only common rows * * @group Core - * @group DataTable */ public function testAddSimpleAllCommonRow() { @@ -690,7 +676,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase * test add 2 different tables to the same table * * @group Core - * @group DataTable */ public function testAddDataTable2times() { @@ -745,7 +730,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable */ public function testUnrelatedDataTableNotDestructed() { @@ -765,7 +749,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable */ public function testGetSerializedCallsCleanPostSerialize() { @@ -780,7 +763,6 @@ class DataTableTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group DataTable */ public function testSubDataTableIsDestructed() { diff --git a/tests/PHPUnit/Core/DateTest.php b/tests/PHPUnit/Core/DateTest.php index 44cf2cf5a5..ad4252c1a4 100644 --- a/tests/PHPUnit/Core/DateTest.php +++ b/tests/PHPUnit/Core/DateTest.php @@ -14,7 +14,6 @@ class DateTest extends PHPUnit_Framework_TestCase * create today object check that timestamp is correct (midnight) * * @group Core - * @group Date */ public function testToday() { @@ -31,7 +30,6 @@ class DateTest extends PHPUnit_Framework_TestCase * create today object check that timestamp is correct (midnight) * * @group Core - * @group Date */ public function testYesterday() { @@ -41,7 +39,6 @@ class DateTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Date */ public function testInvalidDateThrowsException() { @@ -55,7 +52,6 @@ class DateTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Date */ public function testFactoryTimezone() { @@ -89,7 +85,6 @@ class DateTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Date */ public function testSetTimezoneDayInUTC() { @@ -140,7 +135,6 @@ class DateTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Date */ public function testModifyDateWithTimezone() { @@ -163,7 +157,6 @@ class DateTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Date */ public function testGetDateStartUTCEndDuringDstTimezone() { @@ -181,7 +174,6 @@ class DateTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Date */ public function testAddHour() { @@ -206,7 +198,6 @@ class DateTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Date */ public function testAddHourLongHours() { @@ -218,7 +209,6 @@ class DateTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Date */ public function testAddPeriod() { @@ -235,7 +225,6 @@ class DateTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Date */ public function testSubPeriod() { diff --git a/tests/PHPUnit/Core/HttpTest.php b/tests/PHPUnit/Core/HttpTest.php index 1f9fb0fce3..3042bfaadc 100644 --- a/tests/PHPUnit/Core/HttpTest.php +++ b/tests/PHPUnit/Core/HttpTest.php @@ -23,7 +23,7 @@ class HttpTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Http + * * @dataProvider getMethodsToTest */ public function testFetchRemoteFile($method) @@ -35,7 +35,6 @@ class HttpTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Http */ public function testFetchApiLatestVersion() { @@ -47,7 +46,6 @@ class HttpTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Http */ public function testFetchLatestZip() { @@ -59,7 +57,7 @@ class HttpTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Http + * * @dataProvider getMethodsToTest */ public function testCustomByteRange($method) @@ -88,7 +86,7 @@ class HttpTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Http + * * @dataProvider getMethodsToTest */ public function testHEADOperation($method) diff --git a/tests/PHPUnit/Core/IPTest.php b/tests/PHPUnit/Core/IPTest.php index bee0bc8754..564b7edfb8 100644 --- a/tests/PHPUnit/Core/IPTest.php +++ b/tests/PHPUnit/Core/IPTest.php @@ -58,7 +58,6 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @dataProvider getIPData * @group Core - * @group IP */ public function testSanitizeIp($ip, $expected) { @@ -99,7 +98,6 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @dataProvider getIPRangeData * @group Core - * @group IP */ public function testSanitizeIpRange($ip, $expected) { @@ -130,7 +128,6 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @dataProvider getP2NTestData * @group Core - * @group IP */ public function testP2N($P, $N) { @@ -166,7 +163,7 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group IP + * * @dataProvider getP2NInvalidInputData */ public function testP2NInvalidInput($P) @@ -176,7 +173,6 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group IP */ public function getN2PTestData() { @@ -207,7 +203,6 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @dataProvider getP2NTestData * @group Core - * @group IP */ public function testN2P($P, $N) { @@ -217,7 +212,6 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @dataProvider getN2PTestData * @group Core - * @group IP */ public function testN2PinvalidInput($N) { @@ -227,7 +221,6 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @dataProvider getP2NTestData * @group Core - * @group IP */ public function testPrettyPrint($P, $N) { @@ -237,7 +230,6 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @dataProvider getN2PTestData * @group Core - * @group IP */ public function testPrettyPrintInvalidInput($N) { @@ -296,7 +288,6 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @dataProvider getIPv4Data * @group Core - * @group IP */ public function testIsIPv4($ip, $bool) { @@ -353,7 +344,6 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @dataProvider getLong2IPTestData * @group Core - * @group IP */ public function testLong2ip($N, $P) { @@ -445,7 +435,6 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @dataProvider getIPsForRangeTest * @group Core - * @group IP */ public function testGetIpsForRange($range, $expected) { @@ -544,7 +533,7 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group IP + * * @dataProvider getIpsInRangeData */ public function testIsIpInRange($range, $test) @@ -581,7 +570,6 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @dataProvider getIpFromHeaderTestData * @group Core - * @group IP */ public function testGetIpFromHeader($description, $test) { @@ -613,7 +601,7 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group IP + * * @dataProvider getIpTestData */ public function testGetNonProxyIpFromHeader($ip) @@ -623,7 +611,7 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group IP + * * @dataProvider getIpTestData */ public function testGetNonProxyIpFromHeader2($ip) @@ -636,7 +624,7 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group IP + * * @dataProvider getIpTestData */ public function testGetNonProxyIpFromHeader3($ip) @@ -672,7 +660,7 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group IP + * * @dataProvider getLastIpFromListTestData */ public function testGetLastIpFromList($csv, $expected) @@ -686,7 +674,6 @@ class IPTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group IP */ public function testGetHostByAddr() { diff --git a/tests/PHPUnit/Core/JsProxyTest.php b/tests/PHPUnit/Core/JsProxyTest.php index 7aa89965d1..7ec8d4ed25 100644 --- a/tests/PHPUnit/Core/JsProxyTest.php +++ b/tests/PHPUnit/Core/JsProxyTest.php @@ -3,7 +3,6 @@ class Test_Piwik_JsProxy extends PHPUnit_Framework_TestCase { /** * @group Core - * @group JsProxy */ function testPiwikJs() { @@ -22,7 +21,6 @@ class Test_Piwik_JsProxy extends PHPUnit_Framework_TestCase /** * @group Core - * @group JsProxy */ function testPiwikPhp() { diff --git a/tests/PHPUnit/Core/LogTest.php b/tests/PHPUnit/Core/LogTest.php index ead7b7488d..7b2b3b8c11 100644 --- a/tests/PHPUnit/Core/LogTest.php +++ b/tests/PHPUnit/Core/LogTest.php @@ -92,7 +92,7 @@ dummy backtrace' /** * @group Core - * @group Access + * * @dataProvider getBackendsToTest */ public function testLoggingWorksWhenMessageIsString($backend) @@ -109,7 +109,7 @@ dummy backtrace' /** * @group Core - * @group Access + * * @dataProvider getBackendsToTest */ public function testLoggingWorksWhenMessageIsSprintfString($backend) @@ -126,7 +126,7 @@ dummy backtrace' /** * @group Core - * @group Access + * * @dataProvider getBackendsToTest */ public function testLoggingWorksWhenMessageIsError($backend) @@ -145,7 +145,7 @@ dummy backtrace' /** * @group Core - * @group Access + * * @dataProvider getBackendsToTest */ public function testLoggingWorksWhenMessageIsException($backend) @@ -164,7 +164,7 @@ dummy backtrace' /** * @group Core - * @group Access + * * @dataProvider getBackendsToTest */ public function testLoggingCorrectlyIdentifiesPlugin($backend) @@ -181,7 +181,7 @@ dummy backtrace' /** * @group Core - * @group Access + * * @dataProvider getBackendsToTest */ public function testLogMessagesIgnoredWhenNotWithinLevel($backend) diff --git a/tests/PHPUnit/Core/NonceTest.php b/tests/PHPUnit/Core/NonceTest.php index d60bfdf78a..01a1f7ffd3 100644 --- a/tests/PHPUnit/Core/NonceTest.php +++ b/tests/PHPUnit/Core/NonceTest.php @@ -27,7 +27,6 @@ class NonceTest extends PHPUnit_Framework_TestCase /** * @dataProvider getAcceptableOriginsTestData * @group Core - * @group Nonce */ public function test_getAcceptableOrigins($host, $expected) { diff --git a/tests/PHPUnit/Core/OptionTest.php b/tests/PHPUnit/Core/OptionTest.php index f6bd624d60..982ada567c 100644 --- a/tests/PHPUnit/Core/OptionTest.php +++ b/tests/PHPUnit/Core/OptionTest.php @@ -15,7 +15,6 @@ class OptionTest extends DatabaseTestCase { /** * @group Core - * @group Option */ public function testGet() { @@ -37,7 +36,6 @@ class OptionTest extends DatabaseTestCase /** * @group Core - * @group Option */ public function testGetOption() { @@ -59,7 +57,6 @@ class OptionTest extends DatabaseTestCase /** * @group Core - * @group Option */ public function testSet() { @@ -73,7 +70,6 @@ class OptionTest extends DatabaseTestCase /** * @group Core - * @group Option */ public function testSetOption() { @@ -87,7 +83,6 @@ class OptionTest extends DatabaseTestCase /** * @group Core - * @group Option */ public function testDelete() { @@ -123,7 +118,6 @@ class OptionTest extends DatabaseTestCase /** * @group Core - * @group Option */ public function testDeleteLike() { diff --git a/tests/PHPUnit/Core/Period/DayTest.php b/tests/PHPUnit/Core/Period/DayTest.php index 7bf2c8e6d6..c0952722f0 100644 --- a/tests/PHPUnit/Core/Period/DayTest.php +++ b/tests/PHPUnit/Core/Period/DayTest.php @@ -16,8 +16,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase { /** * @group Core - * @group Period - * @group Period_Day */ public function testInvalidDate() { @@ -31,8 +29,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Period_Day */ public function testToString() { @@ -45,8 +41,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase /** * today is NOT finished * @group Core - * @group Period - * @group Period_Day */ public function testDayIsFinishedToday() { @@ -59,8 +53,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase /** * yesterday 23:59:59 is finished * @group Core - * @group Period - * @group Period_Day */ public function testDayIsFinishedYesterday() { @@ -74,8 +66,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase /** * tomorrow is not finished * @group Core - * @group Period - * @group Period_Day */ public function testDayIsFinishedTomorrow() { @@ -88,8 +78,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase /** * test day doesnt exist 31st feb * @group Core - * @group Period - * @group Period_Day */ public function testDayIsFinished31stfeb() { @@ -102,8 +90,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase /** * test date that doesn't exist, should return the corresponding correct date * @group Core - * @group Period - * @group Period_Day */ public function testDayGetDateStart1() { @@ -123,8 +109,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase /** * test normal date * @group Core - * @group Period - * @group Period_Day */ public function testDayGetDateStart2() { @@ -144,8 +128,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase /** * test last day of year * @group Core - * @group Period - * @group Period_Day */ public function testDayGetDateStart3() { @@ -165,8 +147,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase /** * test date that doesn't exist, should return the corresponding correct date * @group Core - * @group Period - * @group Period_Day */ public function testDayGetDateEnd1() { @@ -183,8 +163,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase /** * test normal date * @group Core - * @group Period - * @group Period_Day */ public function testDayGetDateEnd2() { @@ -201,8 +179,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase /** * test last day of year * @group Core - * @group Period - * @group Period_Day */ public function testDayGetDateEnd3() { @@ -219,8 +195,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase /** * adding a subperiod should not be possible * @group Core - * @group Period - * @group Period_Day */ public function testAddSubperiodFails() { @@ -238,8 +212,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Period_Day */ public function testGetLocalizedShortString() { @@ -251,8 +223,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Period_Day */ public function testGetLocalizedLongString() { @@ -264,8 +234,6 @@ class Period_DayTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Period_Day */ public function testGetPrettyString() { diff --git a/tests/PHPUnit/Core/Period/MonthTest.php b/tests/PHPUnit/Core/Period/MonthTest.php index f0ffc396eb..7322da40b1 100644 --- a/tests/PHPUnit/Core/Period/MonthTest.php +++ b/tests/PHPUnit/Core/Period/MonthTest.php @@ -17,8 +17,6 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase /** * testing december * @group Core - * @group Period - * @group Period_Month */ public function testMonthDec() { @@ -62,8 +60,6 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase /** * testing month feb leap year * @group Core - * @group Period - * @group Period_Month */ public function testMonthFebLeap() { @@ -105,8 +101,6 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase /** * testing month feb non-leap year * @group Core - * @group Period - * @group Period_Month */ public function testMonthFebNonLeap() { @@ -147,8 +141,6 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase /** * testing jan * @group Core - * @group Period - * @group Period_Month */ public function testMonthJan() { @@ -192,8 +184,6 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase /** * testing month containing a time change (DST) * @group Core - * @group Period - * @group Period_Month */ public function testMonthDSTChangeMarch() { @@ -236,8 +226,6 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Period_Month */ public function testMonthDSTChangeOct() { @@ -280,8 +268,6 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Period_Month */ public function testGetLocalizedShortString() { @@ -293,8 +279,6 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Period_Month */ public function testGetLocalizedLongString() { @@ -306,8 +290,6 @@ class Period_MonthTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Period_Month */ public function testGetPrettyString() { diff --git a/tests/PHPUnit/Core/Period/RangeTest.php b/tests/PHPUnit/Core/Period/RangeTest.php index f4d54646b2..3bd290fa45 100644 --- a/tests/PHPUnit/Core/Period/RangeTest.php +++ b/tests/PHPUnit/Core/Period/RangeTest.php @@ -17,8 +17,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range 1 /** * @group Core - * @group Period - * @group Range */ public function testRangeToday() { @@ -36,8 +34,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testRangeTodayUtcPlus12() { @@ -57,8 +53,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range 2 /** * @group Core - * @group Period - * @group Range */ public function testRange2days() { @@ -78,8 +72,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range 3 /** * @group Core - * @group Period - * @group Range */ public function testRange5days() { @@ -99,8 +91,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range 4 /** * @group Core - * @group Period - * @group Range */ public function testRangePrevious3days() { @@ -120,8 +110,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range date1,date2 /** * @group Core - * @group Period - * @group Range */ public function testRangeComma1() { @@ -141,8 +129,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range date1,date2 /** * @group Core - * @group Period - * @group Range */ public function testRangeComma2() { @@ -172,8 +158,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range date1,date2 /** * @group Core - * @group Period - * @group Range */ public function testRangeWeekcomma1() { @@ -219,8 +203,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range date1,date2 /** * @group Core - * @group Period - * @group Range */ public function testRangeYearcomma1() { @@ -264,8 +246,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range date1,date2 /** * @group Core - * @group Period - * @group Range */ public function testRangeMonthcomma1() { @@ -347,8 +327,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range WEEK /** * @group Core - * @group Period - * @group Range */ public function testRangeWeek() { @@ -372,8 +350,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range WEEK last1 /** * @group Core - * @group Period - * @group Range */ public function testRangeWeekLast1() { @@ -386,8 +362,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range MONTH /** * @group Core - * @group Period - * @group Range */ public function testRangeMonth() { @@ -410,8 +384,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range MONTH last1 /** * @group Core - * @group Period - * @group Range */ public function testRangeMonthLast1() { @@ -424,8 +396,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range PREVIOUS MONTH /** * @group Core - * @group Period - * @group Range */ public function testRangePreviousmonth() { @@ -450,8 +420,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range YEAR /** * @group Core - * @group Period - * @group Range */ public function testRangeYear() { @@ -474,8 +442,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase // test range YEAR last1 /** * @group Core - * @group Period - * @group Range */ public function testRangeYearLast1() { @@ -487,8 +453,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testCustomRangeWeekInsideEndingToday() { @@ -522,8 +486,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testCustomRangeWeekInsideEndingYesterday() { @@ -562,8 +524,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testCustomRangeOnlyDaysLessThanOneWeek() { @@ -580,8 +540,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testCustomRangeOneWeekOnly() { @@ -604,8 +562,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testCustomRangeStartsWithWeek() { @@ -630,8 +586,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testCustomRangeEndsWithWeek() { @@ -666,8 +620,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testCustomRangeContainsMonthAndWeek() { @@ -733,8 +685,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testCustomRangeContainsSeveralMonthsAndWeeksStartingWithMonth() { @@ -849,8 +799,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testCustomRangeOneMonthOnly() { @@ -895,8 +843,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function test_CustomRange_startsWithWeek_EndsWithMonth() { @@ -952,8 +898,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testCustomRangeBeforeIsAfterYearRight() { @@ -971,8 +915,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testCustomRangeLastN() { @@ -990,8 +932,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testCustomRangePreviousN() { @@ -1008,8 +948,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testCustomRangePreviousNEndToday() { @@ -1025,8 +963,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testInvalidRangeThrows() { @@ -1041,8 +977,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testGetLocalizedShortString() { @@ -1054,8 +988,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testGetLocalizedLongString() { @@ -1067,8 +999,6 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range */ public function testGetPrettyString() { @@ -1091,8 +1021,8 @@ class Period_RangeTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Range + * + * * @dataProvider getDataForLastNLimitsTest */ public function testLastNLimits($period, $lastN, $expectedLastN) diff --git a/tests/PHPUnit/Core/Period/WeekTest.php b/tests/PHPUnit/Core/Period/WeekTest.php index 738c0a5ac7..57052e2dd4 100644 --- a/tests/PHPUnit/Core/Period/WeekTest.php +++ b/tests/PHPUnit/Core/Period/WeekTest.php @@ -17,8 +17,6 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase /** * test week between 2 years * @group Core - * @group Period - * @group Period_Week */ public function testWeekBetween2years() { @@ -38,8 +36,6 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase /** * test week between 2 months Week Mai 29 To Mai 31 2006 * @group Core - * @group Period - * @group Period_Week */ public function testWeekBetween2month() { @@ -59,8 +55,6 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase /** * test week between feb and march for leap year * @group Core - * @group Period - * @group Period_Week */ public function testWeekFebLeapyear() { @@ -84,8 +78,6 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase /** * test week between feb and march for no leap year * @group Core - * @group Period - * @group Period_Week */ public function testWeekFebnonLeapyear() { @@ -109,8 +101,6 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase /** * test week normal middle of the month * @group Core - * @group Period - * @group Period_Week */ public function testWeekMiddleofmonth() { @@ -130,8 +120,6 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Period_Week */ public function testGetLocalizedShortString() { @@ -143,8 +131,6 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Period_Week */ public function testGetLocalizedLongString() { @@ -156,8 +142,6 @@ class Period_WeekTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Period_Week */ public function testGetPrettyString() { diff --git a/tests/PHPUnit/Core/Period/YearTest.php b/tests/PHPUnit/Core/Period/YearTest.php index 2850593a17..0bc2a30e14 100644 --- a/tests/PHPUnit/Core/Period/YearTest.php +++ b/tests/PHPUnit/Core/Period/YearTest.php @@ -17,8 +17,6 @@ class Period_YearTest extends PHPUnit_Framework_TestCase /** * test normal case * @group Core - * @group Period - * @group Period_Year */ public function testYearNormalcase() { @@ -44,8 +42,6 @@ class Period_YearTest extends PHPUnit_Framework_TestCase /** * test past * @group Core - * @group Period - * @group Period_Year */ public function testYearPastAndWrongdate() { @@ -71,8 +67,6 @@ class Period_YearTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Period_Year */ public function testGetLocalizedShortString() { @@ -84,8 +78,6 @@ class Period_YearTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Period_Year */ public function testGetLocalizedLongString() { @@ -97,8 +89,6 @@ class Period_YearTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period - * @group Period_Year */ public function testGetPrettyString() { diff --git a/tests/PHPUnit/Core/PeriodTest.php b/tests/PHPUnit/Core/PeriodTest.php index 97ad458ea3..c9ebcd11ef 100644 --- a/tests/PHPUnit/Core/PeriodTest.php +++ b/tests/PHPUnit/Core/PeriodTest.php @@ -16,7 +16,6 @@ class PeriodTest extends PHPUnit_Framework_TestCase { /** * @group Core - * @group Period */ public function testGetId() { @@ -32,7 +31,6 @@ class PeriodTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period */ public function testGetLabel() { @@ -56,7 +54,6 @@ class PeriodTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period */ public function testFactoryDay() { @@ -66,7 +63,6 @@ class PeriodTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period */ public function testFactoryMonth() { @@ -76,7 +72,6 @@ class PeriodTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period */ public function testFactoryWeek() { @@ -86,7 +81,6 @@ class PeriodTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period */ public function testFactoryYear() { @@ -96,7 +90,6 @@ class PeriodTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Period */ public function testFactoryInvalid() { diff --git a/tests/PHPUnit/Core/PiwikTest.php b/tests/PHPUnit/Core/PiwikTest.php index e78c209fca..92d90598aa 100644 --- a/tests/PHPUnit/Core/PiwikTest.php +++ b/tests/PHPUnit/Core/PiwikTest.php @@ -34,7 +34,7 @@ class PiwikTest extends DatabaseTestCase /** * @group Core - * @group Piwik + * * @dataProvider getValidNumeric */ public function testIsNumericValid($toTest) @@ -58,7 +58,7 @@ class PiwikTest extends DatabaseTestCase /** * @group Core - * @group Piwik + * * @dataProvider getInvalidNumeric */ public function testIsNumericNotValid($toTest) @@ -68,7 +68,6 @@ class PiwikTest extends DatabaseTestCase /** * @group Core - * @group Piwik */ public function testSecureDiv() { @@ -108,7 +107,7 @@ class PiwikTest extends DatabaseTestCase /** * @group Core - * @group Piwik + * * @dataProvider getPrettyTimeFromSecondsData */ public function testGetPrettyTimeFromSeconds($seconds, $expected) @@ -154,7 +153,7 @@ class PiwikTest extends DatabaseTestCase /** * @group Core - * @group Piwik + * * @dataProvider getInvalidLoginStringData */ public function testCheckInvalidLoginString($toTest) @@ -185,7 +184,7 @@ class PiwikTest extends DatabaseTestCase /** * @group Core - * @group Piwik + * * @dataProvider getValidLoginStringData */ public function testCheckValidLoginString($toTest) @@ -210,7 +209,7 @@ class PiwikTest extends DatabaseTestCase /** * @group Core - * @group Piwik + * * @dataProvider getGetPrettyValueTestCases */ public function testGetPrettyValue($columnName, $value, $expected) @@ -247,7 +246,7 @@ class PiwikTest extends DatabaseTestCase /** * @group Core - * @group Piwik + * * @dataProvider getIsAssociativeArrayTestCases */ public function testIsAssociativeArray($array, $expected) @@ -257,7 +256,6 @@ class PiwikTest extends DatabaseTestCase /** * @group Core - * @group Piwik */ public function testCheckIfFileSystemIsNFSOnNonNFS() { diff --git a/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php b/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php index 690a248c01..c281933438 100644 --- a/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php +++ b/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php @@ -14,8 +14,6 @@ class WidgetsListTest extends DatabaseTestCase { /** * @group Core - * @group PluginsFunctions - * @group WidgetsList */ public function testGet() { @@ -62,8 +60,6 @@ class WidgetsListTest extends DatabaseTestCase /** * @group Core - * @group PluginsFunctions - * @group WidgetsList */ public function testGetWithGoals() { @@ -99,8 +95,6 @@ class WidgetsListTest extends DatabaseTestCase /** * @group Core - * @group PluginsFunctions - * @group WidgetsList */ public function testGetWithGoalsAndEcommerce() { diff --git a/tests/PHPUnit/Core/RankingQueryTest.php b/tests/PHPUnit/Core/RankingQueryTest.php index 8ee1040499..843bce0c1f 100644 --- a/tests/PHPUnit/Core/RankingQueryTest.php +++ b/tests/PHPUnit/Core/RankingQueryTest.php @@ -13,7 +13,6 @@ class RankingQueryTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group RankingQuery */ public function testBasic() { @@ -54,7 +53,6 @@ class RankingQueryTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group RankingQuery */ public function testExcludeRows() { @@ -92,7 +90,6 @@ class RankingQueryTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group RankingQuery */ public function testPartitionResult() { diff --git a/tests/PHPUnit/Core/ReleaseCheckListTest.php b/tests/PHPUnit/Core/ReleaseCheckListTest.php index 4fb6f847e7..1582a8afd6 100644 --- a/tests/PHPUnit/Core/ReleaseCheckListTest.php +++ b/tests/PHPUnit/Core/ReleaseCheckListTest.php @@ -19,7 +19,6 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group ReleaseCheckList */ public function testCheckThatConfigurationValuesAreProductionValues() { @@ -51,7 +50,6 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group ReleaseCheckList */ public function testTemplatesDontContainDebug() { @@ -65,7 +63,6 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group ReleaseCheckList */ public function testCheckThatGivenPluginsAreDisabledByDefault() { @@ -84,7 +81,6 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase /** * test that the profiler is disabled (mandatory on a production server) * @group Core - * @group ReleaseCheckList */ public function testProfilingDisabledInProduction() { @@ -94,7 +90,6 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group ReleaseCheckList */ public function testPiwikTrackerDebugIsOff() { @@ -115,7 +110,6 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group ReleaseCheckList */ public function testEndOfLines() { @@ -160,7 +154,6 @@ class ReleaseCheckListTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group ReleaseCheckList */ public function testPiwikJavaScript() { diff --git a/tests/PHPUnit/Core/ScheduledTaskTest.php b/tests/PHPUnit/Core/ScheduledTaskTest.php index cb26d68fa0..33c581102d 100644 --- a/tests/PHPUnit/Core/ScheduledTaskTest.php +++ b/tests/PHPUnit/Core/ScheduledTaskTest.php @@ -14,7 +14,6 @@ class ScheduledTaskTest extends PHPUnit_Framework_TestCase { /** * @group Core - * @group ScheduledTask */ public function testGetClassName() { @@ -37,7 +36,7 @@ class ScheduledTaskTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group ScheduledTask + * * @dataProvider getTaskNameTestCases */ public function testGetTaskName($expectedTaskName, $className, $methodName, $methodParameter) diff --git a/tests/PHPUnit/Core/ScheduledTime/DailyTest.php b/tests/PHPUnit/Core/ScheduledTime/DailyTest.php index 501e1adb34..ae1dce887b 100644 --- a/tests/PHPUnit/Core/ScheduledTime/DailyTest.php +++ b/tests/PHPUnit/Core/ScheduledTime/DailyTest.php @@ -28,8 +28,6 @@ class ScheduledTime_DailyTest extends PHPUnit_Framework_TestCase /** * Tests invalid call to setHour on Daily * @group Core - * @group ScheduledTime - * @group ScheduledTime_Daily */ public function testSetHourScheduledTimeDailyNegative() { @@ -46,8 +44,6 @@ class ScheduledTime_DailyTest extends PHPUnit_Framework_TestCase /** * Tests invalid call to setHour on Daily * @group Core - * @group ScheduledTime - * @group ScheduledTime_Daily */ public function testSetHourScheduledTimeDailyOver24() { @@ -63,8 +59,6 @@ class ScheduledTime_DailyTest extends PHPUnit_Framework_TestCase /** * Tests forbidden call to setDay on Daily * @group Core - * @group ScheduledTime - * @group ScheduledTime_Daily */ public function testSetDayScheduledTimeDaily() { @@ -80,8 +74,6 @@ class ScheduledTime_DailyTest extends PHPUnit_Framework_TestCase /** * Tests getRescheduledTime on Daily with unspecified hour * @group Core - * @group ScheduledTime - * @group ScheduledTime_Daily */ public function testGetRescheduledTimeDailyUnspecifiedHour() { @@ -105,8 +97,6 @@ class ScheduledTime_DailyTest extends PHPUnit_Framework_TestCase /** * Tests getRescheduledTime on Daily with specified hour * @group Core - * @group ScheduledTime - * @group ScheduledTime_Daily */ public function testGetRescheduledTimeDailySpecifiedHour() { diff --git a/tests/PHPUnit/Core/ScheduledTime/HourlyTest.php b/tests/PHPUnit/Core/ScheduledTime/HourlyTest.php index 43b422739f..2b621bff2b 100644 --- a/tests/PHPUnit/Core/ScheduledTime/HourlyTest.php +++ b/tests/PHPUnit/Core/ScheduledTime/HourlyTest.php @@ -24,8 +24,6 @@ class ScheduledTime_HourlyTest extends PHPUnit_Framework_TestCase /** * Tests forbidden call to setHour on Hourly * @group Core - * @group ScheduledTime - * @group ScheduledTime_Hourly */ public function testSetHourScheduledTimeHourly() { @@ -41,8 +39,6 @@ class ScheduledTime_HourlyTest extends PHPUnit_Framework_TestCase /** * Tests forbidden call to setDay on Hourly * @group Core - * @group ScheduledTime - * @group ScheduledTime_Hourly */ public function testSetDayScheduledTimeHourly() { @@ -58,8 +54,6 @@ class ScheduledTime_HourlyTest extends PHPUnit_Framework_TestCase /** * Tests getRescheduledTime on Hourly * @group Core - * @group ScheduledTime - * @group ScheduledTime_Hourly */ public function testGetRescheduledTimeHourly() { diff --git a/tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php b/tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php index 00f61917df..c13a7d825d 100644 --- a/tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php +++ b/tests/PHPUnit/Core/ScheduledTime/MonthlyTest.php @@ -36,8 +36,6 @@ class ScheduledTime_MonthlyTest extends PHPUnit_Framework_TestCase /** * Tests invalid call to setHour on Monthly * @group Core - * @group ScheduledTime - * @group ScheduledTime_Monthly */ public function testSetHourScheduledTimeMonthlyNegative() { @@ -53,8 +51,6 @@ class ScheduledTime_MonthlyTest extends PHPUnit_Framework_TestCase /** * Tests invalid call to setHour on Monthly * @group Core - * @group ScheduledTime - * @group ScheduledTime_Monthly */ public function testSetHourScheduledTimMonthlyOver24() { @@ -70,8 +66,6 @@ class ScheduledTime_MonthlyTest extends PHPUnit_Framework_TestCase /** * Tests invalid call to setDay on Monthly * @group Core - * @group ScheduledTime - * @group ScheduledTime_Monthly */ public function testSetDayScheduledTimeMonthlyDay0() { @@ -87,8 +81,6 @@ class ScheduledTime_MonthlyTest extends PHPUnit_Framework_TestCase /** * Tests invalid call to setDay on Monthly * @group Core - * @group ScheduledTime - * @group ScheduledTime_Monthly */ public function testSetDayScheduledTimeMonthlyOver31() { @@ -104,8 +96,6 @@ class ScheduledTime_MonthlyTest extends PHPUnit_Framework_TestCase /** * Tests getRescheduledTime on Monthly with unspecified hour and unspecified day * @group Core - * @group ScheduledTime - * @group ScheduledTime_Monthly */ public function testGetRescheduledTimeMonthlyUnspecifiedHourUnspecifiedDay() { @@ -148,8 +138,8 @@ class ScheduledTime_MonthlyTest extends PHPUnit_Framework_TestCase /** * Tests getRescheduledTime on Monthly with unspecified hour and specified day * @group Core - * @group ScheduledTime - * @group ScheduledTime_Monthly + * + * _Monthly * * @dataProvider getSpecifiedDayData */ @@ -223,8 +213,6 @@ class ScheduledTime_MonthlyTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group ScheduledTime - * @group ScheduledTime_Monthly */ public function testMonthlyDayOfWeek() { @@ -241,8 +229,8 @@ class ScheduledTime_MonthlyTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group ScheduledTime - * @group ScheduledTime_Monthly + * + * _Monthly * * @dataProvider getInvalidDayOfWeekData */ diff --git a/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php b/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php index a5a6913db1..4eb5a96e41 100644 --- a/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php +++ b/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php @@ -30,8 +30,6 @@ class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase /** * Tests invalid call to setHour on Weekly * @group Core - * @group ScheduledTime - * @group ScheduledTime_Weekly */ public function testSetHourScheduledTimeWeeklyNegative() { @@ -47,8 +45,6 @@ class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase /** * Tests invalid call to setHour on Weekly * @group Core - * @group ScheduledTime - * @group ScheduledTime_Weekly */ public function testSetHourScheduledTimeWeeklyOver24() { @@ -64,8 +60,6 @@ class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase /** * Tests invalid call to setDay on Weekly * @group Core - * @group ScheduledTime - * @group ScheduledTime_Weekly */ public function testSetDayScheduledTimeWeeklyDay0() { @@ -81,8 +75,6 @@ class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase /** * Tests invalid call to setDay on Weekly * @group Core - * @group ScheduledTime - * @group ScheduledTime_Weekly */ public function testSetDayScheduledTimeWeeklyOver7() { @@ -98,8 +90,6 @@ class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase /** * Tests getRescheduledTime on Weekly with unspecified hour and unspecified day * @group Core - * @group ScheduledTime - * @group ScheduledTime_Weekly */ public function testGetRescheduledTimeWeeklyUnspecifiedHourUnspecifiedDay() { @@ -124,8 +114,6 @@ class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase /** * Tests getRescheduledTime on Weekly with specified hour and unspecified day * @group Core - * @group ScheduledTime - * @group ScheduledTime_Weekly */ public function testGetRescheduledTimeWeeklySpecifiedHourUnspecifiedDay() { @@ -151,8 +139,6 @@ class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase /** * Tests getRescheduledTime on Weekly with unspecified hour and specified day * @group Core - * @group ScheduledTime - * @group ScheduledTime_Weekly */ public function testGetRescheduledTimeWeeklyUnspecifiedHourSpecifiedDay() { diff --git a/tests/PHPUnit/Core/SegmentExpressionTest.php b/tests/PHPUnit/Core/SegmentExpressionTest.php index 75d73c754a..f9bf85913a 100644 --- a/tests/PHPUnit/Core/SegmentExpressionTest.php +++ b/tests/PHPUnit/Core/SegmentExpressionTest.php @@ -42,7 +42,6 @@ class SegmentExpressionTest extends PHPUnit_Framework_TestCase /** * @dataProvider getSimpleSegmentExpressions * @group Core - * @group SegmentExpression */ public function testSegmentSqlSimpleNoOperation($expression, $expectedSql) { @@ -83,7 +82,6 @@ class SegmentExpressionTest extends PHPUnit_Framework_TestCase /** * @dataProvider getOperationSegmentExpressions * @group Core - * @group SegmentExpression */ public function testSegmentSqlWithOperations($expression, $expectedSql) { @@ -116,7 +114,6 @@ class SegmentExpressionTest extends PHPUnit_Framework_TestCase /** * @dataProvider getBogusFilters * @group Core - * @group SegmentExpression */ public function testBogusFiltersExpectExceptionThrown($bogus) { diff --git a/tests/PHPUnit/Core/SegmentTest.php b/tests/PHPUnit/Core/SegmentTest.php index 15ff24173d..d48f77104e 100644 --- a/tests/PHPUnit/Core/SegmentTest.php +++ b/tests/PHPUnit/Core/SegmentTest.php @@ -93,7 +93,6 @@ class SegmentTest extends PHPUnit_Framework_TestCase /** * @dataProvider getCommonTestData * @group Core - * @group Segment */ public function testCommon($segment, $expected) { @@ -125,7 +124,6 @@ class SegmentTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Segment */ public function testGetSelectQueryNoJoin() { @@ -156,7 +154,6 @@ class SegmentTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Segment */ public function testGetSelectQueryJoinVisitOnAction() { @@ -188,7 +185,6 @@ class SegmentTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Segment */ public function testGetSelectQueryJoinActionOnVisit() { @@ -227,7 +223,6 @@ class SegmentTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Segment */ public function testGetSelectQueryJoinConversionOnAction() { @@ -259,7 +254,6 @@ class SegmentTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Segment */ public function testGetSelectQueryJoinActionOnConversion() { @@ -291,7 +285,6 @@ class SegmentTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Segment */ public function testGetSelectQueryJoinConversionOnVisit() { @@ -329,7 +322,6 @@ class SegmentTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Segemnt */ public function testGetSelectQueryConversionOnly() { @@ -360,7 +352,6 @@ class SegmentTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Segment */ public function testGetSelectQueryJoinVisitOnConversion() { @@ -395,7 +386,6 @@ class SegmentTest extends PHPUnit_Framework_TestCase * make sure that conversion is joined on action not visit * * @group Core - * @group Segment */ public function testGetSelectQueryJoinVisitAndConversionOnAction() { @@ -429,7 +419,6 @@ class SegmentTest extends PHPUnit_Framework_TestCase * make sure actions are joined before conversions * * @group Core - * @group Segment */ public function testGetSelectQueryJoinConversionAndActionOnVisit() { @@ -478,7 +467,7 @@ class SegmentTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Segment + * * @dataProvider getBogusSegments */ public function testBogusSegmentThrowsException($segment) diff --git a/tests/PHPUnit/Core/ServeStaticFileTest.php b/tests/PHPUnit/Core/ServeStaticFileTest.php index 9f2089d4f1..9482227fea 100644 --- a/tests/PHPUnit/Core/ServeStaticFileTest.php +++ b/tests/PHPUnit/Core/ServeStaticFileTest.php @@ -49,7 +49,7 @@ class Test_Piwik_ServeStaticFile extends PHPUnit_Framework_TestCase /** * Test that php compression isn't enabled ... otherwise, lots of tests will fail * - * @group ServeStaticFile + * @group Core */ public function test_phpOutputCompression() { @@ -59,7 +59,7 @@ class Test_Piwik_ServeStaticFile extends PHPUnit_Framework_TestCase /** * Checks that "HTTP/1.0 404 Not Found" is returned when Piwik::serverStaticFile is called with a null file * - * @group ServeStaticFile + * @group Core */ public function test_nullFile() { @@ -77,7 +77,7 @@ class Test_Piwik_ServeStaticFile extends PHPUnit_Framework_TestCase * Checks that "HTTP/1.0 404 Not Found" is returned when Piwik::serverStaticFile is called with a non existing file * * - * @group ServeStaticFile + * @group Core */ public function test_ghostFile() { @@ -95,7 +95,7 @@ class Test_Piwik_ServeStaticFile extends PHPUnit_Framework_TestCase * Checks that "HTTP/1.0 505 Internal server error" is returned when Piwik::serverStaticFile is called with a * non-readable file * - * @group ServeStaticFile + * @group Core */ public function test_nonReadableFile() { @@ -132,7 +132,7 @@ class Test_Piwik_ServeStaticFile extends PHPUnit_Framework_TestCase * - file is send back without compression * - cache control headers are correctly set * - * @group ServeStaticFile + * @group Core */ public function test_firstAccessNoCompression() { @@ -175,7 +175,7 @@ class Test_Piwik_ServeStaticFile extends PHPUnit_Framework_TestCase * Expected : * - "HTTP/1.1 304 Not Modified" sent back to client * - * @group ServeStaticFile + * @group Core */ public function test_secondAccessNoCompression() { @@ -198,7 +198,7 @@ class Test_Piwik_ServeStaticFile extends PHPUnit_Framework_TestCase * Expected : * - http return code 200 sent back to client * - * @group ServeStaticFile + * @group Core */ public function test_secondAccessNoCompressionExpiredFile() { @@ -222,7 +222,7 @@ class Test_Piwik_ServeStaticFile extends PHPUnit_Framework_TestCase * - the response has to be readable, it tests the proxy doesn't compress the file when compression * is enabled in php. * - * @group ServeStaticFile + * @group Core */ public function test_responseReadableWithPhpCompression() { @@ -247,7 +247,7 @@ class Test_Piwik_ServeStaticFile extends PHPUnit_Framework_TestCase * - the response has to be readable * - the compression method used must be gzdeflate and not gzcompression to be IE compatible * - * @group ServeStaticFile + * @group Core */ public function test_deflateCompression() { @@ -281,7 +281,7 @@ class Test_Piwik_ServeStaticFile extends PHPUnit_Framework_TestCase * - the response has to be readable * - the compression method used is gzip * - * @group ServeStaticFile + * @group Core */ public function test_gzipCompression() { @@ -312,7 +312,7 @@ class Test_Piwik_ServeStaticFile extends PHPUnit_Framework_TestCase * Expected : * - the compressed file cache mechanism works file, ie. the .deflate file is not generated twice * - * @group ServeStaticFile + * @group Core */ public function test_compressionCache() { @@ -353,7 +353,7 @@ class Test_Piwik_ServeStaticFile extends PHPUnit_Framework_TestCase * Expected : * - the test file has been updated, the cached compressed file should be regenerated * - * @group ServeStaticFile + * @group Core */ public function test_compressionCacheInvalidation() { diff --git a/tests/PHPUnit/Core/SqlTest.php b/tests/PHPUnit/Core/SqlTest.php index 021a09527e..e1eb17229c 100755 --- a/tests/PHPUnit/Core/SqlTest.php +++ b/tests/PHPUnit/Core/SqlTest.php @@ -29,7 +29,6 @@ class SqlTest extends DatabaseTestCase /** * @group Core - * @group Unzip */ public function testOptimize() { diff --git a/tests/PHPUnit/Core/TaskSchedulerTest.php b/tests/PHPUnit/Core/TaskSchedulerTest.php index b771669ef9..60c5f5421a 100644 --- a/tests/PHPUnit/Core/TaskSchedulerTest.php +++ b/tests/PHPUnit/Core/TaskSchedulerTest.php @@ -47,7 +47,6 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group TaskScheduler * @dataProvider getTimetableFromOptionValueTestCases */ public function testGetTimetableFromOptionValue($expectedTimetable, $option) @@ -75,7 +74,7 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group TaskScheduler + * * @dataProvider taskHasBeenScheduledOnceTestCases */ public function testTaskHasBeenScheduledOnce($expectedDecision, $taskName, $timetable) @@ -104,7 +103,6 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group TaskScheduler * @dataProvider getScheduledTimeForMethodTestCases */ public function testGetScheduledTimeForMethod($expectedTime, $className, $methodName, $methodParameter, $timetable) @@ -138,7 +136,7 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group TaskScheduler + * * @dataProvider taskShouldBeExecutedTestCases */ public function testTaskShouldBeExecuted($expectedDecision, $taskName, $timetable) @@ -165,7 +163,7 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group TaskScheduler + * * @dataProvider executeTaskTestCases */ public function testExecuteTask($methodName, $parameterValue) @@ -184,6 +182,8 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase } /** + * @group Core + * * Dataprovider for testRunTasks */ public function testRunTasksTestCases() @@ -276,7 +276,7 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group TaskScheduler + * * @dataProvider testRunTasksTestCases */ public function testRunTasks($expectedTimetable, $expectedExecutedTasks, $timetableBeforeTaskExecution, $configuredTasks) diff --git a/tests/PHPUnit/Core/Tracker/ActionTest.php b/tests/PHPUnit/Core/Tracker/ActionTest.php index f7ceca7412..b358a4b04c 100644 --- a/tests/PHPUnit/Core/Tracker/ActionTest.php +++ b/tests/PHPUnit/Core/Tracker/ActionTest.php @@ -107,8 +107,6 @@ class Tracker_ActionTest extends DatabaseTestCase * No excluded query parameters specified, apart from the standard "session" parameters, always excluded * * @group Core - * @group Tracker - * @group Tracker_Action * @dataProvider getTestUrls */ public function testExcludeQueryParametersNone($url, $filteredUrl) @@ -137,8 +135,6 @@ class Tracker_ActionTest extends DatabaseTestCase /** * Test removing hash tag * @group Core - * @group Tracker - * @group Tracker_Action * @dataProvider getTestUrlsHashtag */ public function testRemoveTrailingHashtag($url, $expectedUrl) @@ -150,8 +146,6 @@ class Tracker_ActionTest extends DatabaseTestCase /** * Testing with some website specific parameters excluded * @group Core - * @group Tracker - * @group Tracker_Action * @dataProvider getTestUrls */ public function testExcludeQueryParametersSiteExcluded($url, $filteredUrl) @@ -168,8 +162,6 @@ class Tracker_ActionTest extends DatabaseTestCase /** * Testing with some website specific and some global excluded query parameters * @group Core - * @group Tracker - * @group Tracker_Action * @dataProvider getTestUrls */ public function testExcludeQueryParametersSiteAndGlobalExcluded($url, $filteredUrl) @@ -361,8 +353,6 @@ class Tracker_ActionTest extends DatabaseTestCase /** * @dataProvider getExtractUrlData * @group Core - * @group Tracker - * @group Tracker_Action */ public function testExtractUrlAndActionNameFromRequest($request, $expected) { diff --git a/tests/PHPUnit/Core/Tracker/VisitTest.php b/tests/PHPUnit/Core/Tracker/VisitTest.php index 56821d310a..865c0ec0c1 100644 --- a/tests/PHPUnit/Core/Tracker/VisitTest.php +++ b/tests/PHPUnit/Core/Tracker/VisitTest.php @@ -69,8 +69,6 @@ class Tracker_VisitTest extends DatabaseTestCase /** * @group Core - * @group Tracker - * @group Tracker_Visit * @dataProvider getExcludedIpTestData */ public function testIsVisitorIpExcluded($excludedIp, $tests) @@ -116,8 +114,6 @@ class Tracker_VisitTest extends DatabaseTestCase /** * @group Core - * @group Tracker - * @group Tracker_Visit * @dataProvider getExcludedUserAgentTestData */ public function testIsVisitorUserAgentExcluded($excludedUserAgent, $tests) diff --git a/tests/PHPUnit/Core/Translate/Filter/ByBaseTranslationsTest.php b/tests/PHPUnit/Core/Translate/Filter/ByBaseTranslationsTest.php index f4ec1aaec2..9f540baf6c 100644 --- a/tests/PHPUnit/Core/Translate/Filter/ByBaseTranslationsTest.php +++ b/tests/PHPUnit/Core/Translate/Filter/ByBaseTranslationsTest.php @@ -145,7 +145,6 @@ class ByBaseTranslationsTest extends PHPUnit_Framework_TestCase /** * @dataProvider getFilterTestData * @group Core - * @group Translate */ public function testFilter($translations, $baseTranslations, $expected, $filteredData) { diff --git a/tests/PHPUnit/Core/Translate/Filter/ByParameterCountTest.php b/tests/PHPUnit/Core/Translate/Filter/ByParameterCountTest.php index 317eda8dd0..d6d853d848 100644 --- a/tests/PHPUnit/Core/Translate/Filter/ByParameterCountTest.php +++ b/tests/PHPUnit/Core/Translate/Filter/ByParameterCountTest.php @@ -110,7 +110,6 @@ class ByParameterCountTest extends PHPUnit_Framework_TestCase /** * @dataProvider getFilterTestData * @group Core - * @group Translate */ public function testFilter($translations, $baseTranslations, $expected, $filteredData) { diff --git a/tests/PHPUnit/Core/Translate/Filter/EmptyTranslationsTest.php b/tests/PHPUnit/Core/Translate/Filter/EmptyTranslationsTest.php index cd3cfd735b..91948abbec 100644 --- a/tests/PHPUnit/Core/Translate/Filter/EmptyTranslationsTest.php +++ b/tests/PHPUnit/Core/Translate/Filter/EmptyTranslationsTest.php @@ -82,7 +82,6 @@ class EmptyTranslationsTest extends PHPUnit_Framework_TestCase /** * @dataProvider getFilterTestData * @group Core - * @group Translate */ public function testFilter($translations, $expected, $filteredData) { diff --git a/tests/PHPUnit/Core/Translate/Filter/EncodedEntitiesTest.php b/tests/PHPUnit/Core/Translate/Filter/EncodedEntitiesTest.php index afaf1142ca..ced6720395 100644 --- a/tests/PHPUnit/Core/Translate/Filter/EncodedEntitiesTest.php +++ b/tests/PHPUnit/Core/Translate/Filter/EncodedEntitiesTest.php @@ -96,7 +96,6 @@ class EncodedEntitiesTest extends PHPUnit_Framework_TestCase /** * @dataProvider getFilterTestData * @group Core - * @group Translate */ public function testFilter($translations, $expected, $filteredData) { diff --git a/tests/PHPUnit/Core/Translate/Filter/UnnecassaryWhitespacesTest.php b/tests/PHPUnit/Core/Translate/Filter/UnnecassaryWhitespacesTest.php index bdb24095ef..36378439b7 100644 --- a/tests/PHPUnit/Core/Translate/Filter/UnnecassaryWhitespacesTest.php +++ b/tests/PHPUnit/Core/Translate/Filter/UnnecassaryWhitespacesTest.php @@ -141,7 +141,6 @@ class UnnecassaryWhitepsacesTest extends PHPUnit_Framework_TestCase /** * @dataProvider getFilterTestData * @group Core - * @group Translate */ public function testFilter($translations, $baseTranslations, $expected, $filteredData) { diff --git a/tests/PHPUnit/Core/Translate/Validate/CoreTranslationsTest.php b/tests/PHPUnit/Core/Translate/Validate/CoreTranslationsTest.php index adb41b685a..5bd1ec0b1f 100644 --- a/tests/PHPUnit/Core/Translate/Validate/CoreTranslationsTest.php +++ b/tests/PHPUnit/Core/Translate/Validate/CoreTranslationsTest.php @@ -34,7 +34,6 @@ class CoreTranslationsTest extends PHPUnit_Framework_TestCase /** * @dataProvider getFilterTestDataValid * @group Core - * @group Translate */ public function testFilterValid($translations) { @@ -129,7 +128,6 @@ class CoreTranslationsTest extends PHPUnit_Framework_TestCase /** * @dataProvider getFilterTestDataInvalid * @group Core - * @group Translate */ public function testFilterInvalid($translations, $msg) { diff --git a/tests/PHPUnit/Core/Translate/Validate/NoScriptsTest.php b/tests/PHPUnit/Core/Translate/Validate/NoScriptsTest.php index 31ad20dd22..67fd7c11d8 100644 --- a/tests/PHPUnit/Core/Translate/Validate/NoScriptsTest.php +++ b/tests/PHPUnit/Core/Translate/Validate/NoScriptsTest.php @@ -34,7 +34,6 @@ class NoScriptsTest extends PHPUnit_Framework_TestCase /** * @dataProvider getFilterTestDataValid * @group Core - * @group Translate */ public function testFilterValid($translations) { @@ -98,7 +97,6 @@ class NoScriptsTest extends PHPUnit_Framework_TestCase /** * @dataProvider getFilterTestDataInvalid * @group Core - * @group Translate */ public function testFilterInvalid($translations) { diff --git a/tests/PHPUnit/Core/Translate/WriterTest.php b/tests/PHPUnit/Core/Translate/WriterTest.php index 18c4ee6deb..717d54285c 100644 --- a/tests/PHPUnit/Core/Translate/WriterTest.php +++ b/tests/PHPUnit/Core/Translate/WriterTest.php @@ -24,7 +24,7 @@ class WriterTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Translate + * * @dataProvider getValidConstructorData */ public function testConstructorValid($language, $plugin) @@ -45,7 +45,7 @@ class WriterTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Translate + * * @expectedException Exception */ public function testConstructorInvalid() @@ -55,7 +55,6 @@ class WriterTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Translate */ public function testHasTranslations() { @@ -66,7 +65,6 @@ class WriterTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Translate */ public function testHasNoTranslations() { @@ -76,7 +74,6 @@ class WriterTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Translate */ public function testSetTranslationsEmpty() { @@ -88,7 +85,7 @@ class WriterTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Translate + * * @dataProvider getInvalidTranslations */ public function testSetTranslationsInvalid($translations, $error) @@ -129,7 +126,7 @@ class WriterTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Translate + * * @expectedException Exception */ public function testSaveException() @@ -140,7 +137,7 @@ class WriterTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Translate + * * @expectedException Exception */ public function testSaveTemporaryException() @@ -151,7 +148,6 @@ class WriterTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Translate */ public function testSaveTranslation() { @@ -186,7 +182,7 @@ class WriterTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Translate + * * @dataProvider getTranslationPathTestData */ public function testGetTranslationsPath($language, $plugin, $path) @@ -207,7 +203,7 @@ class WriterTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Translate + * * @dataProvider getTranslationPathTemporaryTestData */ public function testGetTemporaryTranslationPath($language, $plugin, $path) @@ -228,7 +224,7 @@ class WriterTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Translate + * * @dataProvider getValidLanguages */ public function testSetLanguageValid($language) @@ -254,7 +250,7 @@ class WriterTest extends PHPUnit_Framework_TestCase } /** * @group Core - * @group Translate + * * @expectedException Exception * @dataProvider getInvalidLanguages */ diff --git a/tests/PHPUnit/Core/TranslateTest.php b/tests/PHPUnit/Core/TranslateTest.php index 551e25a972..b9d6e5c780 100644 --- a/tests/PHPUnit/Core/TranslateTest.php +++ b/tests/PHPUnit/Core/TranslateTest.php @@ -33,7 +33,6 @@ class TranslateTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Translate * @dataProvider getCleanTestData */ public function testClean($data, $expected) diff --git a/tests/PHPUnit/Core/UnzipTest.php b/tests/PHPUnit/Core/UnzipTest.php index a0865e6e46..3390ffb363 100644 --- a/tests/PHPUnit/Core/UnzipTest.php +++ b/tests/PHPUnit/Core/UnzipTest.php @@ -15,7 +15,6 @@ class UnzipTest extends PHPUnit_Framework_TestCase { /** * @group Core - * @group Unzip */ public function testRelativePath() { @@ -61,7 +60,6 @@ class UnzipTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Unzip */ public function testRelativePathAttack() { @@ -93,7 +91,6 @@ class UnzipTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Unzip */ public function testAbsolutePathAttack() { @@ -119,7 +116,6 @@ class UnzipTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Unzip */ public function testUnzipErrorInfo() { @@ -133,7 +129,6 @@ class UnzipTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Unzip */ public function testUnzipEmptyFile() { @@ -148,7 +143,6 @@ class UnzipTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Unzip */ public function testUnzipNotExistingFile() { @@ -165,7 +159,6 @@ class UnzipTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Unzip */ public function testUnzipInvalidFile2() { @@ -182,7 +175,6 @@ class UnzipTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Unzip */ public function testGzipFile() { @@ -199,7 +191,6 @@ class UnzipTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Unzip */ public function testTarGzFile() { diff --git a/tests/PHPUnit/Core/UpdaterTest.php b/tests/PHPUnit/Core/UpdaterTest.php index 543fe6edfa..e16af91b4d 100644 --- a/tests/PHPUnit/Core/UpdaterTest.php +++ b/tests/PHPUnit/Core/UpdaterTest.php @@ -11,7 +11,6 @@ class UpdaterTest extends DatabaseTestCase { /** * @group Core - * @group Updater */ public function testUpdaterChecksCoreVersionAndDetectsUpdateFile() { @@ -25,7 +24,6 @@ class UpdaterTest extends DatabaseTestCase /** * @group Core - * @group Updater */ public function testUpdaterChecksGivenPluginVersionAndDetectsMultipleUpdateFileInOrder() { @@ -49,7 +47,6 @@ class UpdaterTest extends DatabaseTestCase /** * @group Core - * @group Updater */ public function testUpdaterChecksCoreAndPluginCheckThatCoreIsRanFirst() { diff --git a/tests/PHPUnit/Core/UrlTest.php b/tests/PHPUnit/Core/UrlTest.php index bedfd27969..55651c4dcf 100644 --- a/tests/PHPUnit/Core/UrlTest.php +++ b/tests/PHPUnit/Core/UrlTest.php @@ -12,7 +12,6 @@ class UrlTest extends PHPUnit_Framework_TestCase { /** * @group Core - * @group Url */ public function testAllMethods() { @@ -59,7 +58,6 @@ class UrlTest extends PHPUnit_Framework_TestCase /** * @dataProvider getCurrentHosts * @group Core - * @group Url */ public function testGetCurrentHost($description, $test) { @@ -130,7 +128,6 @@ class UrlTest extends PHPUnit_Framework_TestCase /** * @dataProvider getLocalUrls * @group Core - * @group Url */ public function testIsLocalUrl($httphost, $scripturi, $requesturi, $testurl, $result) { @@ -159,7 +156,6 @@ class UrlTest extends PHPUnit_Framework_TestCase /** * @dataProvider getCurrentUrlWithoutFilename * @group Core - * @group Url */ public function testGetCurrentUrlWithoutFilename($expected, $https, $host, $path) { @@ -186,7 +182,6 @@ class UrlTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Url */ public function test_getCurrentScriptName() { @@ -244,7 +239,6 @@ class UrlTest extends PHPUnit_Framework_TestCase /** * @dataProvider getValidHostData * @group Core - * @group Url */ public function testIsValidHost($expected, $host, $trustedHosts, $description) { @@ -255,7 +249,6 @@ class UrlTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Url */ public function testGetReferrer() { @@ -265,7 +258,7 @@ class UrlTest extends PHPUnit_Framework_TestCase /** * @group Core - * @group Url + * * @dataProvider getQueryParameters */ public function testGetQueryStringFromParameters($params, $queryString) diff --git a/tests/PHPUnit/Integration/AnnotationsTest.php b/tests/PHPUnit/Integration/AnnotationsTest.php index 1b0c6d4ce0..bdefb38795 100755 --- a/tests/PHPUnit/Integration/AnnotationsTest.php +++ b/tests/PHPUnit/Integration/AnnotationsTest.php @@ -81,7 +81,6 @@ class AnnotationsTest extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group Annotations */ public function testApi($api, $params) { @@ -90,7 +89,6 @@ class AnnotationsTest extends IntegrationTestCase /** * @group Integration - * @group Annotations */ public function testAddMultipleSitesFail() { @@ -104,7 +102,6 @@ class AnnotationsTest extends IntegrationTestCase /** * @group Integration - * @group Annotations */ public function testAddInvalidDateFail() { @@ -118,7 +115,6 @@ class AnnotationsTest extends IntegrationTestCase /** * @group Integration - * @group Annotations */ public function testSaveMultipleSitesFail() { @@ -132,7 +128,6 @@ class AnnotationsTest extends IntegrationTestCase /** * @group Integration - * @group Annotations */ public function testSaveInvalidDateFail() { @@ -146,7 +141,6 @@ class AnnotationsTest extends IntegrationTestCase /** * @group Integration - * @group Annotations */ public function testSaveInvalidNoteIdFail() { @@ -160,7 +154,6 @@ class AnnotationsTest extends IntegrationTestCase /** * @group Integration - * @group Annotations */ public function testDeleteMultipleSitesFail() { @@ -174,7 +167,6 @@ class AnnotationsTest extends IntegrationTestCase /** * @group Integration - * @group Annotations */ public function testDeleteInvalidNoteIdFail() { @@ -188,7 +180,6 @@ class AnnotationsTest extends IntegrationTestCase /** * @group Integration - * @group Annotations */ public function testGetMultipleSitesFail() { @@ -202,7 +193,6 @@ class AnnotationsTest extends IntegrationTestCase /** * @group Integration - * @group Annotations */ public function testGetInvalidNoteIdFail() { @@ -216,7 +206,6 @@ class AnnotationsTest extends IntegrationTestCase /** * @group Integration - * @group Annotations */ public function testSaveSuccess() { @@ -236,7 +225,6 @@ class AnnotationsTest extends IntegrationTestCase /** * @group Integration - * @group Annotations */ public function testSaveNoChangesSuccess() { @@ -255,7 +243,6 @@ class AnnotationsTest extends IntegrationTestCase /** * @group Integration - * @group Annotations */ public function testDeleteSuccess() { @@ -301,7 +288,6 @@ class AnnotationsTest extends IntegrationTestCase /** * @dataProvider getPermissionsFailData * @group Integration - * @group Annotations */ public function testMethodPermissions($hasAdminAccess, $hasViewAccess, $request, $checkException, $failMessage) { diff --git a/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php b/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php index a81941dc89..33ca5e31ff 100755 --- a/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php +++ b/tests/PHPUnit/Integration/ApiGetReportMetadataTest.php @@ -76,7 +76,6 @@ class Test_Piwik_Integration_ApiGetReportMetadata extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group ApiGetReportMetadata */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/ApiGetReportMetadata_yearTest.php b/tests/PHPUnit/Integration/ApiGetReportMetadata_yearTest.php index 44d2d5df98..61c14c5495 100755 --- a/tests/PHPUnit/Integration/ApiGetReportMetadata_yearTest.php +++ b/tests/PHPUnit/Integration/ApiGetReportMetadata_yearTest.php @@ -38,8 +38,6 @@ class Test_Piwik_Integration_ApiGetReportMetadata_Year extends IntegrationTestCa /** * @dataProvider getApiForTesting * @group Integration - * @group ApiGetReportMetadata - * @group ApiGetReportMetadata_Year */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php index aa5eec7787..ea12644985 100644 --- a/tests/PHPUnit/Integration/ArchiveCronTest.php +++ b/tests/PHPUnit/Integration/ArchiveCronTest.php @@ -62,7 +62,6 @@ class Test_Piwik_Integration_ArchiveCronTest extends IntegrationTestCase /** * @dataProvider getArchivePhpCronOptionsToTest * @group Integration - * @group ImportLogs */ public function testArchivePhpCron($optionGroupName, $archivePhpOptions) { diff --git a/tests/PHPUnit/Integration/AutoSuggestAPITest.php b/tests/PHPUnit/Integration/AutoSuggestAPITest.php index 838cce31f4..612198140f 100644 --- a/tests/PHPUnit/Integration/AutoSuggestAPITest.php +++ b/tests/PHPUnit/Integration/AutoSuggestAPITest.php @@ -26,7 +26,6 @@ class Test_Piwik_Integration_AutoSuggestAPITest extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group AutoSuggestAPITest */ public function testApi($api, $params) { @@ -72,7 +71,6 @@ class Test_Piwik_Integration_AutoSuggestAPITest extends IntegrationTestCase * @depends testApi * @dataProvider getAnotherApiForTesting * @group Integration - * @group AutoSuggestAPITest */ public function testAnotherApi($api, $params) { @@ -115,6 +113,7 @@ class Test_Piwik_Integration_AutoSuggestAPITest extends IntegrationTestCase } /** + * @group Integration * @depends testAnotherApi */ public function testCheckOtherTestsWereComplete() diff --git a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php index 4da489ece3..ab7a68ed17 100644 --- a/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php +++ b/tests/PHPUnit/Integration/BackwardsCompatibility1XTest.php @@ -21,7 +21,6 @@ class Test_Piwik_Integration_BackwardsCompatibility1XTest extends IntegrationTes /** * @dataProvider getApiForTesting * @group Integration - * @group OneVisitorTwoVisits */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/BlobReportLimitingTest.php b/tests/PHPUnit/Integration/BlobReportLimitingTest.php index ade422fafd..a1ca74377b 100755 --- a/tests/PHPUnit/Integration/BlobReportLimitingTest.php +++ b/tests/PHPUnit/Integration/BlobReportLimitingTest.php @@ -87,7 +87,6 @@ class Test_Piwik_Integration_BlobReportLimitingTest extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group BlobReportLimiting */ public function testApi($api, $params) { @@ -96,7 +95,6 @@ class Test_Piwik_Integration_BlobReportLimitingTest extends IntegrationTestCase /** * @group Integration - * @group BlobReportLimiting */ public function testApiWithRankingQuery() { @@ -119,7 +117,6 @@ class Test_Piwik_Integration_BlobReportLimitingTest extends IntegrationTestCase /** * @group Integration - * @group BlobReportLimiting */ public function testApiWithRankingQueryDisabled() { diff --git a/tests/PHPUnit/Integration/CsvExportTest.php b/tests/PHPUnit/Integration/CsvExportTest.php index cfc3a39bfb..25f72f3db9 100755 --- a/tests/PHPUnit/Integration/CsvExportTest.php +++ b/tests/PHPUnit/Integration/CsvExportTest.php @@ -60,7 +60,6 @@ class Test_Piwik_Integration_CsvExport extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group CsvExport */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php index 3445857b8e..6776837a13 100755 --- a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php +++ b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php @@ -17,7 +17,7 @@ class Test_Piwik_Integration_EcommerceOrderWithItems extends IntegrationTestCase /** * @group Integration - * @group EcommerceOrderWithItems + * * */ public function testImagesIncludedInTests() { @@ -27,7 +27,7 @@ class Test_Piwik_Integration_EcommerceOrderWithItems extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group EcommerceOrderWithItems + * * */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/FlattenReportsTest.php b/tests/PHPUnit/Integration/FlattenReportsTest.php index 5fc3eed6df..3a27e76502 100644 --- a/tests/PHPUnit/Integration/FlattenReportsTest.php +++ b/tests/PHPUnit/Integration/FlattenReportsTest.php @@ -16,7 +16,7 @@ class Test_Piwik_Integration_FlattenReports extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group FlattenReports + * */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/ImportLogsTest.php b/tests/PHPUnit/Integration/ImportLogsTest.php index 85cc9100f5..f8e9502e97 100755 --- a/tests/PHPUnit/Integration/ImportLogsTest.php +++ b/tests/PHPUnit/Integration/ImportLogsTest.php @@ -18,7 +18,6 @@ class Test_Piwik_Integration_ImportLogs extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group ImportLogs */ public function testApi($api, $params) { @@ -46,7 +45,7 @@ class Test_Piwik_Integration_ImportLogs extends IntegrationTestCase /** * @group Integration - * @group ImportLogs + * * * NOTE: This test must be last since the new sites that get added are added in * random order. diff --git a/tests/PHPUnit/Integration/LabelFilterTest.php b/tests/PHPUnit/Integration/LabelFilterTest.php index c2fb37adea..2d891c92b2 100644 --- a/tests/PHPUnit/Integration/LabelFilterTest.php +++ b/tests/PHPUnit/Integration/LabelFilterTest.php @@ -17,7 +17,6 @@ class Test_Piwik_Integration_LabelFilter extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group LabelFilter */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php index 95c30bce13..6aaf58400e 100755 --- a/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php +++ b/tests/PHPUnit/Integration/ManyVisitorsOneWebsiteTest.php @@ -22,7 +22,6 @@ class Test_Piwik_Integration_ManyVisitorsOneWebsiteTest extends IntegrationTestC /** * @dataProvider getApiForTesting * @group Integration - * @group TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabled */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/NoVisitTest.php b/tests/PHPUnit/Integration/NoVisitTest.php index 7c69b9cd3b..dcbd83fbc9 100755 --- a/tests/PHPUnit/Integration/NoVisitTest.php +++ b/tests/PHPUnit/Integration/NoVisitTest.php @@ -18,7 +18,6 @@ class Test_Piwik_Integration_NoVisit extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group NoVisit */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/NonUnicodeTest.php b/tests/PHPUnit/Integration/NonUnicodeTest.php index 2d61199f92..9085f12aa0 100755 --- a/tests/PHPUnit/Integration/NonUnicodeTest.php +++ b/tests/PHPUnit/Integration/NonUnicodeTest.php @@ -17,7 +17,6 @@ class Test_Piwik_Integration_NonUnicodeTest extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group NonUnicodeTest */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRangeTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRangeTest.php index 115de18f34..9d36a48357 100755 --- a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRangeTest.php +++ b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRangeTest.php @@ -20,7 +20,6 @@ class Test_Piwik_Integration_OneVisitorOneWebsite_SeveralDaysDateRange extends I /** * @dataProvider getApiForTesting * @group Integration - * @group OneVisitorOneWebsite_SeveralDaysDateRange */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php index d796ca1655..81218bec8e 100755 --- a/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php +++ b/tests/PHPUnit/Integration/OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTestsTest.php @@ -25,7 +25,7 @@ class Test_Piwik_Integration_OneVisitorOneWebsite_SeveralDaysDateRange_Archiving /** * @dataProvider getApiForTesting * @group Integration - * @group OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTests + * * */ public function testApi($api, $params) { @@ -64,7 +64,7 @@ class Test_Piwik_Integration_OneVisitorOneWebsite_SeveralDaysDateRange_Archiving /** * @depends testApi * @group Integration - * @group OneVisitorOneWebsite_SeveralDaysDateRange_ArchivingTests + * * */ public function testCheck() { diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php index e14e611d26..6cf02a935a 100755 --- a/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php +++ b/tests/PHPUnit/Integration/OneVisitorTwoVisitsTest.php @@ -35,7 +35,6 @@ class Test_Piwik_Integration_OneVisitorTwoVisits extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group OneVisitorTwoVisits */ public function testApi($api, $params) { @@ -160,7 +159,6 @@ class Test_Piwik_Integration_OneVisitorTwoVisits extends IntegrationTestCase * Test that Archive::getBlob won't fetch extra unnecessary blobs. * * @group Integration - * @group OneVisitorTwoVisits */ public function testArchiveSingleGetBlob() { @@ -186,7 +184,6 @@ class Test_Piwik_Integration_OneVisitorTwoVisits extends IntegrationTestCase * works when building an archive query object. * * @group Integration - * @group OneVisitorTwoVisits */ public function testArchiveSitesWhenRestrictingToLogin() { diff --git a/tests/PHPUnit/Integration/OneVisitorTwoVisits_withCookieSupportTest.php b/tests/PHPUnit/Integration/OneVisitorTwoVisits_withCookieSupportTest.php index d63ecad3cd..f021f0711f 100755 --- a/tests/PHPUnit/Integration/OneVisitorTwoVisits_withCookieSupportTest.php +++ b/tests/PHPUnit/Integration/OneVisitorTwoVisits_withCookieSupportTest.php @@ -17,7 +17,7 @@ class Test_Piwik_Integration_OneVisitorTwoVisits_WithCookieSupport extends Integ /** * @dataProvider getApiForTesting * @group Integration - * @group OneVisitorTwoVisits_WithCookieSupport + * */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/OneVisitor_LongUrlsTruncatedTest.php b/tests/PHPUnit/Integration/OneVisitor_LongUrlsTruncatedTest.php index 69a8fdc0da..a445f7cbd1 100644 --- a/tests/PHPUnit/Integration/OneVisitor_LongUrlsTruncatedTest.php +++ b/tests/PHPUnit/Integration/OneVisitor_LongUrlsTruncatedTest.php @@ -15,7 +15,6 @@ class Test_Piwik_Integration_OneVisitor_LongUrlsTruncated extends IntegrationTes /** * @dataProvider getApiForTesting * @group Integration - * @group OneVisitor_LongUrlsTruncated */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/OneVisitor_NoKeywordSpecifiedTest.php b/tests/PHPUnit/Integration/OneVisitor_NoKeywordSpecifiedTest.php index ddbdb280f0..e54f29fffa 100755 --- a/tests/PHPUnit/Integration/OneVisitor_NoKeywordSpecifiedTest.php +++ b/tests/PHPUnit/Integration/OneVisitor_NoKeywordSpecifiedTest.php @@ -19,7 +19,6 @@ class Test_Piwik_Integration_OneVisitor_NoKeywordSpecified extends IntegrationTe /** * @dataProvider getApiForTesting * @group Integration - * @group OneVisitor_NoKeywordSpecified */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/OneVisitor_SeveralDays_ImportedInRandomOrderTest.php b/tests/PHPUnit/Integration/OneVisitor_SeveralDays_ImportedInRandomOrderTest.php index c68e30f1fc..6ef072d913 100644 --- a/tests/PHPUnit/Integration/OneVisitor_SeveralDays_ImportedInRandomOrderTest.php +++ b/tests/PHPUnit/Integration/OneVisitor_SeveralDays_ImportedInRandomOrderTest.php @@ -13,7 +13,6 @@ class Test_Piwik_Integration_OneVisitor_SeveralDays_ImportedInRandomOrderTest ex /** * @dataProvider getApiForTesting * @group Integration - * @group OneVisitor_SeveralDays_ImportedInRandomOrder */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/PeriodIsRange_DateIsLastN_MetadataAndNormalAPITest.php b/tests/PHPUnit/Integration/PeriodIsRange_DateIsLastN_MetadataAndNormalAPITest.php index 3b8b4132fa..b7c0eab721 100755 --- a/tests/PHPUnit/Integration/PeriodIsRange_DateIsLastN_MetadataAndNormalAPITest.php +++ b/tests/PHPUnit/Integration/PeriodIsRange_DateIsLastN_MetadataAndNormalAPITest.php @@ -41,7 +41,6 @@ class Test_Piwik_Integration_PeriodIsRange_DateIsLastN_MetadataAndNormalAPI exte /** * @dataProvider getApiForTesting * @group Integration - * @group PeriodIsRange_DateIsLastN_MetadataAndNormalAPI */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/RowEvolutionTest.php b/tests/PHPUnit/Integration/RowEvolutionTest.php index 0af474c6a7..5d34aeced6 100755 --- a/tests/PHPUnit/Integration/RowEvolutionTest.php +++ b/tests/PHPUnit/Integration/RowEvolutionTest.php @@ -16,7 +16,6 @@ class Test_Piwik_Integration_RowEvolution extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group RowEvolution */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/SiteSearchTest.php b/tests/PHPUnit/Integration/SiteSearchTest.php index e8c6ffebcc..51c2b3e20b 100755 --- a/tests/PHPUnit/Integration/SiteSearchTest.php +++ b/tests/PHPUnit/Integration/SiteSearchTest.php @@ -16,7 +16,6 @@ class Test_Piwik_Integration_SiteSearch extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group TwoVisitors_TwoWebsites_DifferentDays */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaigns_ForceUsingVisitIdNotHeuristicsTest.php b/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaigns_ForceUsingVisitIdNotHeuristicsTest.php index 8edc1db967..19da294671 100755 --- a/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaigns_ForceUsingVisitIdNotHeuristicsTest.php +++ b/tests/PHPUnit/Integration/TrackCustomVariablesAndCampaigns_ForceUsingVisitIdNotHeuristicsTest.php @@ -17,7 +17,6 @@ class Test_Piwik_Integration_TrackCustomVariablesAndCampaigns_ForceUsingVisitIdN /** * @dataProvider getApiForTesting * @group Integration - * @group TrackCustomVariablesAndCampaigns_ForceUsingVisitIdNotHeuristics */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/TrackGoals_AllowMultipleConversionsPerVisitTest.php b/tests/PHPUnit/Integration/TrackGoals_AllowMultipleConversionsPerVisitTest.php index d691640d6a..dd2ea9c17d 100755 --- a/tests/PHPUnit/Integration/TrackGoals_AllowMultipleConversionsPerVisitTest.php +++ b/tests/PHPUnit/Integration/TrackGoals_AllowMultipleConversionsPerVisitTest.php @@ -18,7 +18,6 @@ class Test_Piwik_Integration_TrackGoals_AllowMultipleConversionsPerVisit extends /** * @dataProvider getApiForTesting * @group Integration - * @group TrackGoals_AllowMultipleConversionsPerVisit */ public function testApi($api, $params) { @@ -28,7 +27,6 @@ class Test_Piwik_Integration_TrackGoals_AllowMultipleConversionsPerVisit extends /** * @depends testApi * @group Integration - * @group TrackGoals_AllowMultipleConversionsPerVisit */ public function testCheck() { diff --git a/tests/PHPUnit/Integration/TrackerWindowLookBack.php b/tests/PHPUnit/Integration/TrackerWindowLookBack.php index dfc72fc2be..78e808502c 100644 --- a/tests/PHPUnit/Integration/TrackerWindowLookBack.php +++ b/tests/PHPUnit/Integration/TrackerWindowLookBack.php @@ -18,7 +18,6 @@ class Test_Piwik_Integration_TrackerWindowLookBack extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group OneVisitorOneWebsite_SeveralDaysDateRange */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/TrackingAPI_SetVisitorIdTest.php b/tests/PHPUnit/Integration/TrackingAPI_SetVisitorIdTest.php index 4b18c616b8..010c4cdaf5 100644 --- a/tests/PHPUnit/Integration/TrackingAPI_SetVisitorIdTest.php +++ b/tests/PHPUnit/Integration/TrackingAPI_SetVisitorIdTest.php @@ -28,7 +28,6 @@ class Test_Piwik_Integration_TrackingAPI_SetVisitorId extends IntegrationTestCas /** * @dataProvider getApiForTesting * @group Integration - * @group OneVisitorTwoVisits */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/TransitionsTest.php b/tests/PHPUnit/Integration/TransitionsTest.php index 0fc0472f23..aaf7edff70 100644 --- a/tests/PHPUnit/Integration/TransitionsTest.php +++ b/tests/PHPUnit/Integration/TransitionsTest.php @@ -10,7 +10,6 @@ class Test_Piwik_Integration_Transitions extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group Transitions */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php index 83ab5fce96..76fc320b64 100755 --- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php +++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDaysTest.php @@ -21,7 +21,6 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays extends Integ /** * @group Integration - * @group TwoVisitors_TwoWebsites_DifferentDays */ public function testImagesIncludedInTests() { @@ -31,7 +30,6 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays extends Integ /** * @dataProvider getApiForTesting * @group Integration - * @group TwoVisitors_TwoWebsites_DifferentDays */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php index 112d0dd950..cb3c473253 100755 --- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php +++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabledTest.php @@ -16,7 +16,7 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisa /** * @dataProvider getApiForTesting * @group Integration - * @group TwoVisitors_TwoWebsites_DifferentDays_ArchivingDisabled + * */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php index f223a7b66e..df6a4ac718 100755 --- a/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php +++ b/tests/PHPUnit/Integration/TwoVisitors_TwoWebsites_DifferentDays_ConversionsTest.php @@ -21,7 +21,7 @@ class Test_Piwik_Integration_TwoVisitors_TwoWebsites_DifferentDays_Conversions e /** * @dataProvider getApiForTesting * @group Integration - * @group TwoVisitors_TwoWebsites_DifferentDays_Conversions + * */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php index 932ef4ef8b..794ac209da 100755 --- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php +++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariablesTest.php @@ -42,7 +42,6 @@ class Test_Piwik_Integration_TwoVisitsWithCustomVariables extends IntegrationTes /** * @dataProvider getApiForTesting * @group Integration - * @group TwoVisitsWithCustomVariables */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentContainsTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentContainsTest.php index f7ad0d004a..e706079f80 100755 --- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentContainsTest.php +++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentContainsTest.php @@ -21,7 +21,6 @@ class Test_Piwik_Integration_TwoVisitsWithCustomVariables_SegmentContains extend /** * @dataProvider getApiForTesting * @group Integration - * @group TwoVisitsWithCustomVariables_SegmentContains */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchALL_NoGoalDataTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchALL_NoGoalDataTest.php index 620140dde7..d297ddbb6a 100755 --- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchALL_NoGoalDataTest.php +++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchALL_NoGoalDataTest.php @@ -13,7 +13,6 @@ class Test_Piwik_Integration_TwoVisitsWithCustomVariables_SegmentMatchALL_NoGoal /** * @dataProvider getApiForTesting * @group Integration - * @group TwoVisitsWithCustomVariables_SegmentMatchALL_NoGoalData */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchNONETest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchNONETest.php index 7601e74727..96ecc28791 100755 --- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchNONETest.php +++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchNONETest.php @@ -17,7 +17,6 @@ class Test_Piwik_Integration_TwoVisitsWithCustomVariables_SegmentMatchNONE exten /** * @dataProvider getApiForTesting * @group Integration - * @group TwoVisitsWithCustomVariables_SegmentMatchNONE */ public function testApi($api, $params) { diff --git a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php index 4f6e13e414..1ee686248c 100755 --- a/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php +++ b/tests/PHPUnit/Integration/TwoVisitsWithCustomVariables_SegmentMatchVisitorTypeTest.php @@ -18,7 +18,6 @@ class Test_Piwik_Integration_TwoVisitsWithCustomVariables_SegmentMatchVisitorTyp /** * @dataProvider getApiForTesting * @group Integration - * @group TwoVisitsWithCustomVariables_SegmentMatchVisitorType */ public function testApi($api, $params) { @@ -55,7 +54,6 @@ class Test_Piwik_Integration_TwoVisitsWithCustomVariables_SegmentMatchVisitorTyp /** * @depends testApi * @group Integration - * @group TwoVisitsWithCustomVariables_SegmentMatchVisitorType */ public function testCheck() { diff --git a/tests/PHPUnit/Integration/UrlNormalizationTest.php b/tests/PHPUnit/Integration/UrlNormalizationTest.php index 8bbc5d4583..a31d061e8e 100644 --- a/tests/PHPUnit/Integration/UrlNormalizationTest.php +++ b/tests/PHPUnit/Integration/UrlNormalizationTest.php @@ -13,7 +13,6 @@ class Test_Piwik_Integration_UrlNormalization extends IntegrationTestCase /** * @dataProvider getApiForTesting * @group Integration - * @group UrlNormalization */ public function testApi($api, $params) { @@ -83,7 +82,6 @@ class Test_Piwik_Integration_UrlNormalization extends IntegrationTestCase /** * @@depends testApi * @group Integration - * @group UrlNormalization */ public function testCheckPostConditions() { diff --git a/tests/PHPUnit/Integration/VisitsInPast_InvalidateOldReportsTest.php b/tests/PHPUnit/Integration/VisitsInPast_InvalidateOldReportsTest.php index 7df95e3919..7a64f6212c 100644 --- a/tests/PHPUnit/Integration/VisitsInPast_InvalidateOldReportsTest.php +++ b/tests/PHPUnit/Integration/VisitsInPast_InvalidateOldReportsTest.php @@ -17,7 +17,6 @@ class Test_Piwik_Integration_VisitsInPast_InvalidateOldReports extends Integrati /** * @dataProvider getApiForTesting * @group Integration - * @group VisitsInPast_InvalidateOldReports */ public function testApi($api, $params) { @@ -61,7 +60,6 @@ class Test_Piwik_Integration_VisitsInPast_InvalidateOldReports extends Integrati * @depends testApi * @dataProvider getAnotherApiForTesting * @group Integration - * @group VisitsInPast_InvalidateOldReports */ public function testAnotherApi($api, $params) { diff --git a/tests/PHPUnit/Plugins/ActionsTest.php b/tests/PHPUnit/Plugins/ActionsTest.php index deefe54bf0..c7cbaa72d0 100644 --- a/tests/PHPUnit/Plugins/ActionsTest.php +++ b/tests/PHPUnit/Plugins/ActionsTest.php @@ -112,7 +112,6 @@ class ActionsTests extends PHPUnit_Framework_TestCase /** * @dataProvider getActionNameTestData * @group Plugins - * @group Actions */ public function testGetActionExplodedNames($params, $expected) { diff --git a/tests/PHPUnit/Plugins/AnonymizeIPTest.php b/tests/PHPUnit/Plugins/AnonymizeIPTest.php index d4932dc75a..b13b6a7d34 100644 --- a/tests/PHPUnit/Plugins/AnonymizeIPTest.php +++ b/tests/PHPUnit/Plugins/AnonymizeIPTest.php @@ -54,7 +54,6 @@ class AnonymizeIPTest extends PHPUnit_Framework_TestCase /** * @dataProvider getipv4Addresses * @group Plugins - * @group AnonymizeIP */ public function testApplyIPMask($ip, $expected) { @@ -78,7 +77,6 @@ class AnonymizeIPTest extends PHPUnit_Framework_TestCase /** * @dataProvider getipv6Addresses * @group Plugins - * @group AnonymizeIP */ public function testApplyIPMask6($ip, $expected) { diff --git a/tests/PHPUnit/Plugins/LanguagesManagerTest.php b/tests/PHPUnit/Plugins/LanguagesManagerTest.php index ba36680e48..d410dc1f35 100755 --- a/tests/PHPUnit/Plugins/LanguagesManagerTest.php +++ b/tests/PHPUnit/Plugins/LanguagesManagerTest.php @@ -62,7 +62,7 @@ class Test_LanguagesManager extends PHPUnit_Framework_TestCase * test all languages * * @group Plugins - * @group LanguagesManager + * * @dataProvider getTestDataForLanguageFiles */ function testGetTranslationsForLanguages($language, $plugin) @@ -103,7 +103,7 @@ class Test_LanguagesManager extends PHPUnit_Framework_TestCase * test language when it's not defined * * @group Plugins - * @group LanguagesManager + * * @expectedException Exception */ function testWriterInvalidPlugin() @@ -115,7 +115,6 @@ class Test_LanguagesManager extends PHPUnit_Framework_TestCase * test language when it's not defined * * @group Plugins - * @group LanguagesManager */ function testGetTranslationsForLanguagesNot() { @@ -126,7 +125,6 @@ class Test_LanguagesManager extends PHPUnit_Framework_TestCase * test English short name for language * * @group Plugins - * @group LanguagesManager */ function testGetLanguageNamesInEnglish() { @@ -164,7 +162,6 @@ class Test_LanguagesManager extends PHPUnit_Framework_TestCase * test format of DataFile/Languages.php * * @group Plugins - * @group LanguagesManager */ function testGetLanguagesList() { diff --git a/tests/PHPUnit/Plugins/LoginTest.php b/tests/PHPUnit/Plugins/LoginTest.php index 11c18f374a..d45419e5de 100644 --- a/tests/PHPUnit/Plugins/LoginTest.php +++ b/tests/PHPUnit/Plugins/LoginTest.php @@ -39,7 +39,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureNoLoginNoTokenAuth() { @@ -51,7 +50,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureEmptyLoginNoTokenAuth() { @@ -64,7 +62,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureNonExistentUser() { @@ -77,7 +74,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureAnonymousNotExisting() { @@ -91,7 +87,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureAnonymousNotExistentEmptyLogin() { @@ -105,7 +100,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureAnonymousNotExistentEmptyLoginWithTokenAuth() { @@ -119,7 +113,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureAnonymousNotExistentWithLoginAndTokenAuth() { @@ -133,7 +126,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureAnonymousWithLogin() { @@ -149,7 +141,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureAnonymousEmptyLoginWithTokenAuth() { @@ -165,7 +156,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureAnonymousLoginTokenAuthMissmatch() { @@ -181,7 +171,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateSuccessAnonymousWithTokenAuth() { @@ -197,7 +186,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateSuccessAnonymous() { @@ -225,7 +213,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureUserEmptyTokenAuth() { @@ -241,7 +228,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureUserInvalidTokenAuth() { @@ -257,7 +243,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureUserInvalidTokenAuth2() { @@ -273,7 +258,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureUserEmptyLogin() { @@ -289,7 +273,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureUserLoginTokenAuthMissmatch() { @@ -305,7 +288,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureUserLoginTokenAuthMissmatch2() { @@ -321,7 +303,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureUserLoginTokenAuthMissmatch3() { @@ -337,7 +318,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateSuccessUserTokenAuth() { @@ -353,7 +333,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateSuccessUserLoginAndTokenAuth() { @@ -369,7 +348,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateSuccessLoginAndHashedTokenAuth() { @@ -386,7 +364,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureSuperUserEmptyTokenAuth() { @@ -404,7 +381,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureSuperUserInvalidTokenAuth() { @@ -422,7 +398,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureSuperUserInvalidTokenAuth2() { @@ -440,7 +415,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureSuperUserEmptyLogin() { @@ -458,7 +432,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateFailureSuperUserLoginTokenAuthMissmatch() { @@ -476,7 +449,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateSuccessSuperUserTokenAuth() { @@ -494,7 +466,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateSuccessSuperLoginAndTokenAuth() { @@ -512,7 +483,6 @@ class LoginTest extends DatabaseTestCase /** * @group Plugins - * @group Login */ public function testAuthenticateSuccessSuperUserLoginAndHashedTokenAuth() { diff --git a/tests/PHPUnit/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Plugins/MobileMessagingTest.php index f39bce5161..72740f75d1 100644 --- a/tests/PHPUnit/Plugins/MobileMessagingTest.php +++ b/tests/PHPUnit/Plugins/MobileMessagingTest.php @@ -38,7 +38,6 @@ class MobileMessagingTest extends DatabaseTestCase * When the MultiSites plugin is not activated, the SMS content should invite the user to activate it back * * @group Plugins - * @group MobileMessaging */ public function testWarnUserViaSMSMultiSitesDeactivated() { @@ -160,7 +159,7 @@ class MobileMessagingTest extends DatabaseTestCase /** * @group Plugins - * @group MobileMessaging + * * @dataProvider getTruncateTestCases */ public function testTruncate($expected, $stringToTruncate, $maximumNumberOfConcatenatedSMS, $appendedString) @@ -187,7 +186,7 @@ class MobileMessagingTest extends DatabaseTestCase /** * @group Plugins - * @group MobileMessaging + * * @dataProvider getContainsUCS2CharactersTestCases */ public function testContainsUCS2Characters($expected, $stringToTest) @@ -200,7 +199,6 @@ class MobileMessagingTest extends DatabaseTestCase /** * @group Plugins - * @group MobileMessaging */ public function testSanitizePhoneNumber() { @@ -209,7 +207,6 @@ class MobileMessagingTest extends DatabaseTestCase /** * @group Plugins - * @group MobileMessaging */ public function testPhoneNumberIsSanitized() { @@ -232,7 +229,7 @@ class MobileMessagingTest extends DatabaseTestCase /** * @group Plugins - * @group MobileMessaging + * * @dataProvider getSendReportTestCases */ public function testSendReport($expectedReportContent, $expectedPhoneNumber, $expectedFrom, $reportContent, $phoneNumber, $reportSubject) diff --git a/tests/PHPUnit/Plugins/MultiSitesTest.php b/tests/PHPUnit/Plugins/MultiSitesTest.php index d1b1f5f790..7df1b05104 100644 --- a/tests/PHPUnit/Plugins/MultiSitesTest.php +++ b/tests/PHPUnit/Plugins/MultiSitesTest.php @@ -33,7 +33,6 @@ class MultiSitesTest extends DatabaseTestCase * This is necessary otherwise ResponseBuilder throws 'Call to a member function getColumns() on a non-object' * * @group Plugins - * @group MultiSites */ public function testWhenNoDataGetOneReturnsRow() { diff --git a/tests/PHPUnit/Plugins/PrivacyManagerTest.php b/tests/PHPUnit/Plugins/PrivacyManagerTest.php index 9f19f42052..2b57df702e 100755 --- a/tests/PHPUnit/Plugins/PrivacyManagerTest.php +++ b/tests/PHPUnit/Plugins/PrivacyManagerTest.php @@ -134,7 +134,6 @@ class PrivacyManagerTest extends IntegrationTestCase * Make sure the first time deleteLogData is run, nothing happens. * * @group Plugins - * @group PrivacyManager */ public function testDeleteLogDataInitialRun() { @@ -152,7 +151,6 @@ class PrivacyManagerTest extends IntegrationTestCase * Make sure the first time deleteReportData is run, nothing happens. * * @group Plugins - * @group PrivacyManager */ public function testDeleteReportDataInitialRun() { @@ -169,7 +167,6 @@ class PrivacyManagerTest extends IntegrationTestCase * Make sure the task is not run when its scheduled for later. * * @group Plugins - * @group PrivacyManager */ public function testPurgeDataNotTimeToRun() { @@ -189,7 +186,6 @@ class PrivacyManagerTest extends IntegrationTestCase * Make sure purging data runs when scheduled. * * @group Plugins - * @group PrivacyManager */ public function testPurgeDataNotInitialAndTimeToRun() { @@ -236,7 +232,6 @@ class PrivacyManagerTest extends IntegrationTestCase * Make sure nothing happens when deleting logs & reports are both disabled. * * @group Plugins - * @group PrivacyManager */ public function testPurgeDataBothDisabled() { @@ -265,7 +260,6 @@ class PrivacyManagerTest extends IntegrationTestCase * Test that purgeData works when there's no data. * * @group Plugins - * @group PrivacyManager */ public function testPurgeDataDeleteLogsNoData() { @@ -303,7 +297,6 @@ class PrivacyManagerTest extends IntegrationTestCase * Test that purgeData works correctly when the 'keep basic metrics' setting is set to true. * * @group Plugins - * @group PrivacyManager */ public function testPurgeDataDeleteReportsKeepBasicMetrics() { @@ -360,7 +353,6 @@ class PrivacyManagerTest extends IntegrationTestCase * Test that purgeData works correctly when the 'keep daily reports' setting is set to true. * * @group Plugins - * @group PrivacyManager */ public function testPurgeDataDeleteReportsKeepDailyReports() { @@ -397,7 +389,6 @@ class PrivacyManagerTest extends IntegrationTestCase * Test that purgeData works correctly when the 'keep weekly reports' setting is set to true. * * @group Plugins - * @group PrivacyManager */ public function testPurgeDataDeleteReportsKeepWeeklyReports() { @@ -434,7 +425,6 @@ class PrivacyManagerTest extends IntegrationTestCase * Test that purgeData works correctly when the 'keep monthly reports' setting is set to true. * * @group Plugins - * @group PrivacyManager */ public function testPurgeDataDeleteReportsKeepMonthlyReports() { @@ -471,7 +461,6 @@ class PrivacyManagerTest extends IntegrationTestCase * Test that purgeData works correctly when the 'keep yearly reports' setting is set to true. * * @group Plugins - * @group PrivacyManager */ public function testPurgeDataDeleteReportsKeepYearlyReports() { @@ -508,7 +497,6 @@ class PrivacyManagerTest extends IntegrationTestCase * Test no concurrency issues when deleting log data from log_action table. * * @group Plugins - * @group PrivacyManager */ public function testPurgeLogDataConcurrency() { @@ -540,7 +528,6 @@ class PrivacyManagerTest extends IntegrationTestCase * Tests that purgeData works correctly when the 'keep range reports' setting is set to true. * * @group Plugins - * @group PrivacyManager */ public function testPurgeDataDeleteReportsKeepRangeReports() { @@ -577,7 +564,6 @@ class PrivacyManagerTest extends IntegrationTestCase * Tests that purgeData works correctly when the 'keep segment reports' setting is set to true. * * @group Plugins - * @group PrivacyManager */ public function testPurgeDataDeleteReportsKeepSegmentsReports() { diff --git a/tests/PHPUnit/Plugins/ProxyTest.php b/tests/PHPUnit/Plugins/ProxyTest.php index b21c13a28f..590c31be44 100644 --- a/tests/PHPUnit/Plugins/ProxyTest.php +++ b/tests/PHPUnit/Plugins/ProxyTest.php @@ -31,7 +31,6 @@ class ProxyTest extends PHPUnit_Framework_TestCase /** * @dataProvider getAcceptableRemoteUrls * @group Plugins - * @group Proxy */ public function testIsAcceptableRemoteUrl($url, $expected) { diff --git a/tests/PHPUnit/Plugins/ReferrersTest.php b/tests/PHPUnit/Plugins/ReferrersTest.php index e9ad20d062..f4abb76b59 100644 --- a/tests/PHPUnit/Plugins/ReferrersTest.php +++ b/tests/PHPUnit/Plugins/ReferrersTest.php @@ -35,7 +35,7 @@ class ReferrersTest extends PHPUnit_Framework_TestCase * search engine has at least one keyword * * @group Plugins - * @group Referrers + * * @dataProvider getSearchEngines */ public function testMissingSearchEngineKeyword($url, $searchEngine) @@ -55,7 +55,7 @@ class ReferrersTest extends PHPUnit_Framework_TestCase * search engine is defined in DataFiles/SearchEngines.php but there's no favicon * * @group Plugins - * @group Referrers + * * @dataProvider getSearchEngines */ public function testMissingSearchEngineIcons($url, $searchEngine) @@ -78,7 +78,6 @@ class ReferrersTest extends PHPUnit_Framework_TestCase * favicon exists but there's no corresponding search engine defined in DataFiles/SearchEngines.php * * @group Plugins - * @group Referrers */ public function testObsoleteSearchEngineIcons() { @@ -109,7 +108,6 @@ class ReferrersTest extends PHPUnit_Framework_TestCase * get search engine host from url * * @group Plugins - * @group Referrers */ public function testGetSearchEngineHostFromUrl() { @@ -140,7 +138,7 @@ class ReferrersTest extends PHPUnit_Framework_TestCase * get search engine url from name and keyword * * @group Plugins - * @group Referrers + * * @dataProvider getSearchEngineUrlFromUrlAndKeywordTestData */ public function testGetSearchEngineUrlFromUrlAndKeyword($url, $keyword, $expected) diff --git a/tests/PHPUnit/Plugins/SEOTest.php b/tests/PHPUnit/Plugins/SEOTest.php index 3d55311c58..3217a8f598 100644 --- a/tests/PHPUnit/Plugins/SEOTest.php +++ b/tests/PHPUnit/Plugins/SEOTest.php @@ -38,7 +38,6 @@ class SEOTest extends PHPUnit_Framework_TestCase * tell us when the API is broken * * @group Plugins - * @group SEO */ public function test_API() { diff --git a/tests/PHPUnit/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Plugins/ScheduledReportsTest.php index f46390a176..a15f2cdb9c 100644 --- a/tests/PHPUnit/Plugins/ScheduledReportsTest.php +++ b/tests/PHPUnit/Plugins/ScheduledReportsTest.php @@ -41,7 +41,6 @@ class ScheduledReportsTest extends DatabaseTestCase /** * @group Plugins - * @group ScheduledReports */ public function testAddReportGetReports() { @@ -97,7 +96,6 @@ class ScheduledReportsTest extends DatabaseTestCase /** * @group Plugins - * @group ScheduledReports */ public function testGetReportsIdReportNotFound() { @@ -111,7 +109,6 @@ class ScheduledReportsTest extends DatabaseTestCase /** * @group Plugins - * @group ScheduledReports */ public function testGetReportsInvalidPermission() { @@ -130,7 +127,6 @@ class ScheduledReportsTest extends DatabaseTestCase /** * @group Plugins - * @group ScheduledReports */ public function testAddReportInvalidWebsite() { @@ -144,7 +140,6 @@ class ScheduledReportsTest extends DatabaseTestCase /** * @group Plugins - * @group ScheduledReports */ public function testAddReportInvalidPeriod() { @@ -160,7 +155,6 @@ class ScheduledReportsTest extends DatabaseTestCase /** * @group Plugins - * @group ScheduledReports */ public function testUpdateReport() { @@ -179,7 +173,6 @@ class ScheduledReportsTest extends DatabaseTestCase /** * @group Plugins - * @group ScheduledReports */ public function testDeleteReport() { @@ -198,7 +191,6 @@ class ScheduledReportsTest extends DatabaseTestCase /** * @group Plugins - * @group ScheduledReports */ public function testGetTopMenuTranslationKeyMobileMessagingInactive() { @@ -214,7 +206,6 @@ class ScheduledReportsTest extends DatabaseTestCase /** * @group Plugins - * @group ScheduledReports */ public function testGetTopMenuTranslationKeyUserIsAnonymous() { @@ -234,7 +225,6 @@ class ScheduledReportsTest extends DatabaseTestCase * even though there is no sms reports configured * * @group Plugins - * @group ScheduledReports */ public function testGetTopMenuTranslationKeyNoReportMobileAccountOK() { @@ -254,7 +244,6 @@ class ScheduledReportsTest extends DatabaseTestCase * and no reports at all have been configured * * @group Plugins - * @group ScheduledReports */ public function testGetTopMenuTranslationKeyNoReportMobileAccountKO() { @@ -270,7 +259,6 @@ class ScheduledReportsTest extends DatabaseTestCase * whatever the status of the mobile provider account * * @group Plugins - * @group ScheduledReports */ public function testGetTopMenuTranslationKeyOneSMSReportMobileAccountKO() { @@ -299,7 +287,6 @@ class ScheduledReportsTest extends DatabaseTestCase * whatever the status of the mobile provider account * * @group Plugins - * @group ScheduledReports */ public function testGetTopMenuTranslationKeyNoSMSReportAccountOK() { @@ -318,7 +305,6 @@ class ScheduledReportsTest extends DatabaseTestCase /** * @group Plugins - * @group ScheduledReports */ public function testGetScheduledTasks() { @@ -411,7 +397,7 @@ class ScheduledReportsTest extends DatabaseTestCase /** * @group Plugins - * @group ScheduledReports + * * @dataProvider getGetReportSubjectAndReportTitleTestCases */ public function testGetReportSubjectAndReportTitle($expectedReportSubject, $expectedReportTitle, $websiteName, $reports) diff --git a/tests/PHPUnit/Plugins/SegmentEditorTest.php b/tests/PHPUnit/Plugins/SegmentEditorTest.php index 97728d909e..9d0f36d878 100644 --- a/tests/PHPUnit/Plugins/SegmentEditorTest.php +++ b/tests/PHPUnit/Plugins/SegmentEditorTest.php @@ -33,6 +33,9 @@ class SegmentEditorTest extends DatabaseTestCase APISitesManager::getInstance()->addSite('test', 'http://example.org'); } + /** + * @group Plugins + */ public function testAddInvalidSegment_ShouldThrow() { try { @@ -47,6 +50,9 @@ class SegmentEditorTest extends DatabaseTestCase } } + /** + * @group Plugins + */ public function test_AddAndGet_SimpleSegment() { $name = 'name'; @@ -70,6 +76,9 @@ class SegmentEditorTest extends DatabaseTestCase $this->assertEquals($segment, $expected); } + /** + * @group Plugins + */ public function test_AddAndGet_AnotherSegment() { $name = 'name'; @@ -111,6 +120,9 @@ class SegmentEditorTest extends DatabaseTestCase $this->assertEquals($segments, array()); } + /** + * @group Plugins + */ public function test_UpdateSegment() { $name = 'name"'; @@ -152,6 +164,9 @@ class SegmentEditorTest extends DatabaseTestCase $this->assertEquals($newSegment['name'], $nameSegment1); } + /** + * @group Plugins + */ public function test_deleteSegment() { $idSegment1 = API::getInstance()->add('name 1', 'searches==0', $idSite = 1, $autoArchive = 1, $enabledAllUsers = 1); diff --git a/tests/PHPUnit/Plugins/SitesManagerTest.php b/tests/PHPUnit/Plugins/SitesManagerTest.php index e161eb7949..8aa8e85992 100644 --- a/tests/PHPUnit/Plugins/SitesManagerTest.php +++ b/tests/PHPUnit/Plugins/SitesManagerTest.php @@ -26,7 +26,6 @@ class SitesManagerTest extends DatabaseTestCase * empty name -> exception * * @group Plugins - * @group SitesManager */ public function testAddSiteEmptyName() { @@ -57,7 +56,6 @@ class SitesManagerTest extends DatabaseTestCase * * @dataProvider getInvalidUrlData * @group Plugins - * @group SitesManager */ public function testAddSiteWrongUrls($url) { @@ -73,7 +71,6 @@ class SitesManagerTest extends DatabaseTestCase * Test with valid IPs * * @group Plugins - * @group SitesManager */ public function testAddSiteExcludedIpsAndtimezoneAndCurrencyAndExcludedQueryParametersValid() { @@ -122,7 +119,6 @@ class SitesManagerTest extends DatabaseTestCase * * @dataProvider getInvalidIPsData * @group Plugins - * @group SitesManager */ public function testAddSiteExcludedIpsNotValid($ip) { @@ -139,7 +135,6 @@ class SitesManagerTest extends DatabaseTestCase * one url -> one main_url and nothing inserted as alias urls * * @group Plugins - * @group SitesManager */ public function testAddSiteOneUrl() { @@ -160,7 +155,6 @@ class SitesManagerTest extends DatabaseTestCase * several urls -> one main_url and others as alias urls * * @group Plugins - * @group SitesManager */ public function testAddSiteSeveralUrls() { @@ -180,7 +174,6 @@ class SitesManagerTest extends DatabaseTestCase * strange name * * @group Plugins - * @group SitesManager */ public function testAddSiteStrangeName() { @@ -217,7 +210,6 @@ class SitesManagerTest extends DatabaseTestCase * no duplicate -> all the urls are saved * * @group Plugins - * @group SitesManager */ public function testAddSiteUrlsnoDuplicate() { @@ -258,7 +250,6 @@ class SitesManagerTest extends DatabaseTestCase * duplicate -> don't save the already existing URLs * * @group Plugins - * @group SitesManager */ public function testAddSiteUrlsDuplicate() { @@ -285,7 +276,6 @@ class SitesManagerTest extends DatabaseTestCase * case empty array => nothing happens * * @group Plugins - * @group SitesManager */ public function testAddSiteUrlsNoUrlsToAdd1() { @@ -312,7 +302,6 @@ class SitesManagerTest extends DatabaseTestCase * case array only duplicate => nothing happens * * @group Plugins - * @group SitesManager */ public function testAddSiteUrlsNoUrlsToAdd2() { @@ -339,7 +328,6 @@ class SitesManagerTest extends DatabaseTestCase * wrong format urls => exception * * @group Plugins - * @group SitesManager */ public function testAddSiteUrlsWrongUrlsFormat3() { @@ -357,7 +345,6 @@ class SitesManagerTest extends DatabaseTestCase * wrong idsite => no exception because simply no access to this resource * * @group Plugins - * @group SitesManager */ public function testAddSiteUrlsWrongIdSite1() { @@ -374,7 +361,6 @@ class SitesManagerTest extends DatabaseTestCase * wrong idsite => exception * * @group Plugins - * @group SitesManager */ public function testAddSiteUrlsWrongIdSite2() { @@ -391,7 +377,6 @@ class SitesManagerTest extends DatabaseTestCase * no Id -> empty array * * @group Plugins - * @group SitesManager */ public function testGetAllSitesIdNoId() { @@ -403,7 +388,6 @@ class SitesManagerTest extends DatabaseTestCase * several Id -> normal array * * @group Plugins - * @group SitesManager */ public function testGetAllSitesIdSeveralId() { @@ -424,7 +408,6 @@ class SitesManagerTest extends DatabaseTestCase * wrong id => exception * * @group Plugins - * @group SitesManager */ public function testGetSiteFromIdWrongId1() { @@ -440,7 +423,6 @@ class SitesManagerTest extends DatabaseTestCase * wrong id => exception * * @group Plugins - * @group SitesManager */ public function testGetSiteFromIdWrongId2() { @@ -456,7 +438,6 @@ class SitesManagerTest extends DatabaseTestCase * wrong id : no access => exception * * @group Plugins - * @group SitesManager */ public function testGetSiteFromIdWrongId3() { @@ -479,7 +460,6 @@ class SitesManagerTest extends DatabaseTestCase * normal case * * @group Plugins - * @group SitesManager */ public function testGetSiteFromIdNormalId() { @@ -497,7 +477,6 @@ class SitesManagerTest extends DatabaseTestCase * there is no admin site available -> array() * * @group Plugins - * @group SitesManager */ public function testGetSitesWithAdminAccessNoResult() { @@ -511,7 +490,6 @@ class SitesManagerTest extends DatabaseTestCase * normal case, admin and view and noaccess website => return only admin * * @group Plugins - * @group SitesManager */ public function testGetSitesWithAdminAccess() { @@ -538,7 +516,6 @@ class SitesManagerTest extends DatabaseTestCase * there is no admin site available -> array() * * @group Plugins - * @group SitesManager */ public function testGetSitesWithViewAccessNoResult() { @@ -553,7 +530,6 @@ class SitesManagerTest extends DatabaseTestCase * normal case, admin and view and noaccess website => return only admin * * @group Plugins - * @group SitesManager */ public function testGetSitesWithViewAccess() { @@ -580,7 +556,6 @@ class SitesManagerTest extends DatabaseTestCase * there is no admin site available -> array() * * @group Plugins - * @group SitesManager */ public function testGetSitesWithAtLeastViewAccessNoResult() { @@ -595,7 +570,6 @@ class SitesManagerTest extends DatabaseTestCase * normal case, admin and view and noaccess website => return only admin * * @group Plugins - * @group SitesManager */ public function testGetSitesWithAtLeastViewAccess() { @@ -622,7 +596,6 @@ class SitesManagerTest extends DatabaseTestCase * no urls for this site => array() * * @group Plugins - * @group SitesManager */ public function testGetSiteUrlsFromIdNoUrls() { @@ -636,7 +609,6 @@ class SitesManagerTest extends DatabaseTestCase * normal case * * @group Plugins - * @group SitesManager */ public function testGetSiteUrlsFromIdManyUrls() { @@ -662,7 +634,6 @@ class SitesManagerTest extends DatabaseTestCase * wrongId => exception * * @group Plugins - * @group SitesManager */ public function testGetSiteUrlsFromIdWrongId() { @@ -680,7 +651,6 @@ class SitesManagerTest extends DatabaseTestCase * one url => no change to alias urls * * @group Plugins - * @group SitesManager */ public function testUpdateSiteOneUrl() { @@ -725,7 +695,6 @@ class SitesManagerTest extends DatabaseTestCase * strange name and NO URL => name ok, main_url not updated * * @group Plugins - * @group SitesManager */ public function testUpdateSiteStrangeNameNoUrl() { @@ -746,7 +715,6 @@ class SitesManagerTest extends DatabaseTestCase * also test the update of group field * * @group Plugins - * @group SitesManager */ public function testUpdateSiteSeveralUrlsAndGroup() { @@ -794,9 +762,7 @@ class SitesManagerTest extends DatabaseTestCase } /** - * * @group Plugins - * @group SitesManager */ public function testGetSitesGroups() { @@ -822,7 +788,6 @@ class SitesManagerTest extends DatabaseTestCase * * @dataProvider getInvalidTimezoneData * @group Plugins - * @group SitesManager */ public function testAddSitesInvalidTimezone($timezone) { @@ -836,9 +801,7 @@ class SitesManagerTest extends DatabaseTestCase } /** - * * @group Plugins - * @group SitesManager */ public function testAddSitesInvalidCurrency() { @@ -853,9 +816,7 @@ class SitesManagerTest extends DatabaseTestCase } /** - * * @group Plugins - * @group SitesManager */ public function testSetDefaultTimezoneAndCurrencyAndExcludedQueryParametersAndExcludedIps() { @@ -924,9 +885,7 @@ class SitesManagerTest extends DatabaseTestCase } /** - * * @group Plugins - * @group SitesManager */ public function testGetSitesIdFromSiteUrlSuperUser() { @@ -948,9 +907,7 @@ class SitesManagerTest extends DatabaseTestCase } /** - * * @group Plugins - * @group SitesManager */ public function testGetSitesIdFromSiteUrlUser() { @@ -1008,9 +965,7 @@ class SitesManagerTest extends DatabaseTestCase } /** - * * @group Plugins - * @group SitesManager */ public function testGetSitesFromTimezones() { diff --git a/tests/PHPUnit/Plugins/UserAgentParserEnhancedTest.php b/tests/PHPUnit/Plugins/UserAgentParserEnhancedTest.php index 04da324de4..af55c85796 100644 --- a/tests/PHPUnit/Plugins/UserAgentParserEnhancedTest.php +++ b/tests/PHPUnit/Plugins/UserAgentParserEnhancedTest.php @@ -5,6 +5,7 @@ require_once 'DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.p class UserAgentParserEnhancedTest extends PHPUnit_Framework_TestCase { /** + * @group Plugins * @dataProvider getUserAgents_asParsed */ public function testParse($expected) diff --git a/tests/PHPUnit/Plugins/UserCountryTest.php b/tests/PHPUnit/Plugins/UserCountryTest.php index 5d3bb39be7..74c851f2c0 100644 --- a/tests/PHPUnit/Plugins/UserCountryTest.php +++ b/tests/PHPUnit/Plugins/UserCountryTest.php @@ -18,9 +18,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php'; class Test_Piwik_UserCountry extends PHPUnit_Framework_Testcase { /** - * * @group Plugins - * @group UserCountry */ public function testGetFlagFromCode() { @@ -29,9 +27,7 @@ class Test_Piwik_UserCountry extends PHPUnit_Framework_Testcase } /** - * * @group Plugins - * @group UserCountry */ public function testGetFlagFromInvalidCode() { @@ -40,9 +36,7 @@ class Test_Piwik_UserCountry extends PHPUnit_Framework_Testcase } /** - * * @group Plugins - * @group UserCountry */ public function testFlagsAndContinents() { @@ -79,7 +73,6 @@ class Test_Piwik_UserCountry extends PHPUnit_Framework_Testcase * Test that redundant checks work. * * @group Plugins - * @group UserCountry */ public function testGeoIpUpdaterRedundantChecks() { @@ -106,7 +99,7 @@ class Test_Piwik_UserCountry extends PHPUnit_Framework_Testcase /** * @group Plugins - * @group UserCountry + * * @dataProvider getInvalidGeoIpUrlsToTest */ public function testGeoIpDownloadInvalidUrl($url) diff --git a/tests/PHPUnit/Plugins/UserSettingsTest.php b/tests/PHPUnit/Plugins/UserSettingsTest.php index 6f9ac3d2d6..201c25847f 100644 --- a/tests/PHPUnit/Plugins/UserSettingsTest.php +++ b/tests/PHPUnit/Plugins/UserSettingsTest.php @@ -995,7 +995,6 @@ class UserSettingsTest extends PHPUnit_Framework_TestCase * * @dataProvider getUserAgents * @group Plugins - * @group UserSettings */ public function testGetBrowser($userAgent, $expected) { @@ -1021,7 +1020,6 @@ class UserSettingsTest extends PHPUnit_Framework_TestCase * * @dataProvider getUserAgents * @group Plugins - * @group UserSettings */ public function testGetOperatingSystem($userAgent, $expected) { diff --git a/tests/PHPUnit/Plugins/UsersManagerTest.php b/tests/PHPUnit/Plugins/UsersManagerTest.php index 5c3bdffa29..4abc707d64 100644 --- a/tests/PHPUnit/Plugins/UsersManagerTest.php +++ b/tests/PHPUnit/Plugins/UsersManagerTest.php @@ -70,9 +70,7 @@ class UsersManagerTest extends DatabaseTestCase } /** - * * @group Plugins - * @group UsersManager */ public function testAllSuperUserIncluded() { @@ -122,7 +120,6 @@ class UsersManagerTest extends DatabaseTestCase * bad password => exception * * @group Plugins - * @group UsersManager */ public function testUpdateUserBadpasswd() { @@ -164,7 +161,6 @@ class UsersManagerTest extends DatabaseTestCase * * @dataProvider getAddUserInvalidLoginData * @group Plugins - * @group UsersManager */ public function testAddUserWrongLogin($userLogin, $password, $email, $alias) { @@ -181,7 +177,6 @@ class UsersManagerTest extends DatabaseTestCase * existing login => exception * * @group Plugins - * @group UsersManager */ public function testAddUserExistingLogin() { @@ -212,7 +207,6 @@ class UsersManagerTest extends DatabaseTestCase * * @dataProvider getWrongPasswordTestData * @group Plugins - * @group UsersManager */ public function testAddUserWrongPassword($userLogin, $password, $email, $alias) { @@ -242,7 +236,6 @@ class UsersManagerTest extends DatabaseTestCase * * @dataProvider getWrongEmailTestData * @group Plugins - * @group UsersManager */ public function testAddUserWrongEmail($userLogin, $password, $email, $alias) { @@ -259,7 +252,6 @@ class UsersManagerTest extends DatabaseTestCase * empty email => exception * * @group Plugins - * @group UsersManager */ public function testAddUserEmptyEmail() { @@ -277,7 +269,6 @@ class UsersManagerTest extends DatabaseTestCase * empty alias => use login * * @group Plugins - * @group UsersManager */ public function testAddUserEmptyAlias() { @@ -292,7 +283,6 @@ class UsersManagerTest extends DatabaseTestCase * no alias => use login * * @group Plugins - * @group UsersManager */ public function testAddUserNoAliasSpecified() { @@ -307,7 +297,6 @@ class UsersManagerTest extends DatabaseTestCase * normal test case * * @group Plugins - * @group UsersManager */ public function testAddUser() { @@ -342,7 +331,6 @@ class UsersManagerTest extends DatabaseTestCase * user doesnt exist => exception * * @group Plugins - * @group UsersManager */ public function testSeleteUserDoesntExist() { @@ -361,7 +349,6 @@ class UsersManagerTest extends DatabaseTestCase * empty name, doesnt exists =>exception * * @group Plugins - * @group UsersManager */ public function testDeleteUserEmptyUser() { @@ -378,7 +365,6 @@ class UsersManagerTest extends DatabaseTestCase * null user,, doesnt exists => exception * * @group Plugins - * @group UsersManager */ public function testDeleteUserNullUser() { @@ -395,7 +381,6 @@ class UsersManagerTest extends DatabaseTestCase * normal case, user deleted * * @group Plugins - * @group UsersManager */ public function testDeleteUser() { @@ -436,7 +421,6 @@ class UsersManagerTest extends DatabaseTestCase * no user => exception * * @group Plugins - * @group UsersManager */ public function testGetUserNoUser() { @@ -455,7 +439,6 @@ class UsersManagerTest extends DatabaseTestCase * normal case * * @group Plugins - * @group UsersManager */ public function test_GetUser() { @@ -481,7 +464,6 @@ class UsersManagerTest extends DatabaseTestCase * no user => empty array * * @group Plugins - * @group UsersManager */ public function testGetUsersNoUser() { @@ -493,7 +475,6 @@ class UsersManagerTest extends DatabaseTestCase * as well as selecting specific user names, comma separated * * @group Plugins - * @group UsersManager */ public function testGetUsers() { @@ -526,7 +507,6 @@ class UsersManagerTest extends DatabaseTestCase * normal case * * @group Plugins - * @group UsersManager */ public function testGetUsersLogin() { @@ -545,7 +525,6 @@ class UsersManagerTest extends DatabaseTestCase * no login => exception * * @group Plugins - * @group UsersManager */ public function testSetUserAccessNoLogin() { @@ -563,7 +542,6 @@ class UsersManagerTest extends DatabaseTestCase * wrong access specified => exception * * @group Plugins - * @group UsersManager */ public function testSetUserAccessWrongAccess() { @@ -583,7 +561,6 @@ class UsersManagerTest extends DatabaseTestCase * idsites = all => apply access to all websites with admin access * * @group Plugins - * @group UsersManager */ public function testSetUserAccessIdsitesIsAll() { @@ -609,7 +586,6 @@ class UsersManagerTest extends DatabaseTestCase * idsites = all AND user is superuser=> apply access to all websites * * @group Plugins - * @group UsersManager */ public function testSetUserAccessIdsitesIsAllSuperuser() { @@ -634,7 +610,6 @@ class UsersManagerTest extends DatabaseTestCase * idsites is empty => no acccess set * * @group Plugins - * @group UsersManager */ public function testSetUserAccessIdsitesEmpty() { @@ -653,7 +628,6 @@ class UsersManagerTest extends DatabaseTestCase * normal case, access set for only one site * * @group Plugins - * @group UsersManager */ public function testSetUserAccessIdsitesOneSite() { @@ -671,7 +645,6 @@ class UsersManagerTest extends DatabaseTestCase * normal case, access set for multiple sites * * @group Plugins - * @group UsersManager */ public function testSetUserAccessIdsitesMultipleSites() { @@ -693,7 +666,6 @@ class UsersManagerTest extends DatabaseTestCase * normal case, string idSites comma separated access set for multiple sites * * @group Plugins - * @group UsersManager */ public function testSetUserAccessWithIdSitesIsStringCommaSeparated() { @@ -713,7 +685,6 @@ class UsersManagerTest extends DatabaseTestCase * normal case, set different acccess to different websites for one user * * @group Plugins - * @group UsersManager */ public function testSetUserAccessMultipleCallDistinctAccessSameUser() { @@ -733,7 +704,6 @@ class UsersManagerTest extends DatabaseTestCase * normal case, set different access to different websites for multiple users * * @group Plugins - * @group UsersManager */ public function testSetUserAccessMultipleCallDistinctAccessMultipleUser() { @@ -794,7 +764,6 @@ class UsersManagerTest extends DatabaseTestCase * we set access for one user for one site several times and check that it is updated * * @group Plugins - * @group UsersManager */ public function testSetUserAccessMultipleCallOverwriteSingleUserOneSite() { @@ -817,7 +786,6 @@ class UsersManagerTest extends DatabaseTestCase * wrong user => exception * * @group Plugins - * @group UsersManager */ public function testGetSitesAccessFromUserWrongUser() { @@ -834,7 +802,6 @@ class UsersManagerTest extends DatabaseTestCase *wrong idsite => exception * * @group Plugins - * @group UsersManager */ public function testGetUsersAccessFromSiteWrongSite() { @@ -850,7 +817,6 @@ class UsersManagerTest extends DatabaseTestCase * wrong access =>exception * * @group Plugins - * @group UsersManager */ public function testGetUsersSitesFromAccessWrongSite() { @@ -867,7 +833,6 @@ class UsersManagerTest extends DatabaseTestCase * non existing login => exception * * @group Plugins - * @group UsersManager */ public function testUpdateUserWrongLogin() { @@ -885,7 +850,6 @@ class UsersManagerTest extends DatabaseTestCase * no email no alias => keep old ones * * @group Plugins - * @group UsersManager */ public function testUpdateUserNoEmailNoAlias() { @@ -906,7 +870,6 @@ class UsersManagerTest extends DatabaseTestCase *no email => keep old ones * * @group Plugins - * @group UsersManager */ public function testUpdateUserNoEmail() { @@ -927,7 +890,6 @@ class UsersManagerTest extends DatabaseTestCase * no alias => keep old ones * * @group Plugins - * @group UsersManager */ public function testUpdateUserNoAlias() { @@ -948,7 +910,6 @@ class UsersManagerTest extends DatabaseTestCase * check to modify as the user * * @group Plugins - * @group UsersManager */ public function testUpdateUserIAmTheUser() { @@ -960,7 +921,6 @@ class UsersManagerTest extends DatabaseTestCase * check to modify as being another user => exception * * @group Plugins - * @group UsersManager */ public function testUpdateUserIAmNotTheUser() { @@ -978,7 +938,6 @@ class UsersManagerTest extends DatabaseTestCase * normal case, reused in other tests * * @group Plugins - * @group UsersManager */ public function testUpdateUser() { @@ -999,7 +958,6 @@ class UsersManagerTest extends DatabaseTestCase * test getUserByEmail invalid mail * * @group Plugins - * @group UsersManager */ public function testGetUserByEmailInvalidMail() { @@ -1015,7 +973,6 @@ class UsersManagerTest extends DatabaseTestCase * test getUserByEmail * * @group Plugins - * @group UsersManager */ public function testGetUserByEmail() { @@ -1035,7 +992,6 @@ class UsersManagerTest extends DatabaseTestCase /** * @group Plugins - * @group UsersManager */ public function testGetUserPreferenceDefault() { |