diff options
Diffstat (limited to 'tests/PHPUnit/Core')
64 files changed, 87 insertions, 869 deletions
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) |