diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2019-10-10 00:36:19 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-10 00:36:19 +0300 |
commit | 42f9f8cbcc350f9cbcd8a085c38f2ae9155c42d3 (patch) | |
tree | a9ddfc6e8a98eea2d92dcd03e34c284ecbd37a27 /tests/PHPUnit/System | |
parent | e5b034d46ff3a793837944c4f6445c694007ce5f (diff) |
Smaller varchar size for log_action.name (#14859)
Diffstat (limited to 'tests/PHPUnit/System')
10 files changed, 30 insertions, 45 deletions
diff --git a/tests/PHPUnit/System/BlobReportLimitingTest.php b/tests/PHPUnit/System/BlobReportLimitingTest.php index 34b63f2426..c2231e327e 100644 --- a/tests/PHPUnit/System/BlobReportLimitingTest.php +++ b/tests/PHPUnit/System/BlobReportLimitingTest.php @@ -127,6 +127,8 @@ class BlobReportLimitingTest extends SystemTestCase public function testApiWithRankingQuery() { + self::setUpConfigOptions(); + // custom setup self::deleteArchiveTables(); Config::getInstance()->General['archiving_ranking_query_row_limit'] = 3; diff --git a/tests/PHPUnit/System/CustomEventsTest.php b/tests/PHPUnit/System/CustomEventsTest.php index 37cc2312ab..385c6d3c46 100644 --- a/tests/PHPUnit/System/CustomEventsTest.php +++ b/tests/PHPUnit/System/CustomEventsTest.php @@ -28,6 +28,7 @@ class CustomEventsTest extends SystemTestCase */ public function testApi($api, $params) { + $params['xmlFieldsToRemove'] = array('idsubdatatable'); $this->runApiTests($api, $params); } diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml index 51ab1c86b0..853ac06441 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml @@ -286,7 +286,7 @@ <row> <segment>eventAction==playTrailer</segment> - <idsubdatatable>9</idsubdatatable> + <idsubdatatable>4</idsubdatatable> </row> <row> @@ -296,17 +296,17 @@ <row> <segment>eventAction==play25%25</segment> - <idsubdatatable>4</idsubdatatable> + <idsubdatatable>9</idsubdatatable> </row> <row> <segment>eventAction==play50%25</segment> - <idsubdatatable>5</idsubdatatable> + <idsubdatatable>11</idsubdatatable> </row> <row> <segment>eventAction==play75%25</segment> - <idsubdatatable>6</idsubdatatable> + <idsubdatatable>5</idsubdatatable> </row> <row> @@ -316,27 +316,27 @@ <row> <segment>eventAction==rating</segment> - <idsubdatatable>8</idsubdatatable> + <idsubdatatable>10</idsubdatatable> </row> <row> <segment>eventAction==clickBuyNow</segment> - <idsubdatatable>10</idsubdatatable> + <idsubdatatable>12</idsubdatatable> </row> <row> <segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> - <idsubdatatable>12</idsubdatatable> + <idsubdatatable>6</idsubdatatable> </row> <row> <segment>eventAction==play</segment> - <idsubdatatable>3</idsubdatatable> + <idsubdatatable>8</idsubdatatable> </row> <row> <segment>eventAction==playStart</segment> - <idsubdatatable>11</idsubdatatable> + <idsubdatatable>3</idsubdatatable> </row> <row> <segment>eventAction==Purchase</segment> @@ -349,7 +349,7 @@ <row> <segment>eventAction==playTrailer</segment> - <idsubdatatable>21</idsubdatatable> + <idsubdatatable>16</idsubdatatable> </row> <row> @@ -359,32 +359,32 @@ <row> <segment>eventAction==play25%25</segment> - <idsubdatatable>16</idsubdatatable> + <idsubdatatable>15</idsubdatatable> </row> <row> <segment>eventAction==play50%25</segment> - <idsubdatatable>17</idsubdatatable> + <idsubdatatable>20</idsubdatatable> </row> <row> <segment>eventAction==play75%25</segment> - <idsubdatatable>18</idsubdatatable> + <idsubdatatable>17</idsubdatatable> </row> <row> <segment>eventAction==playEnd</segment> - <idsubdatatable>19</idsubdatatable> + <idsubdatatable>22</idsubdatatable> </row> <row> <segment>eventAction==rating</segment> - <idsubdatatable>20</idsubdatatable> + <idsubdatatable>18</idsubdatatable> </row> <row> <segment>eventAction==clickBuyNow</segment> - <idsubdatatable>22</idsubdatatable> + <idsubdatatable>21</idsubdatatable> </row> <row> @@ -394,7 +394,7 @@ <row> <segment>eventAction==play</segment> - <idsubdatatable>15</idsubdatatable> + <idsubdatatable>19</idsubdatatable> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml index 9fd8ba25ac..2fada86989 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml @@ -187,12 +187,12 @@ <row> <segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment> - <idsubdatatable>4</idsubdatatable> + <idsubdatatable>3</idsubdatatable> </row> <row> <segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment> - <idsubdatatable>3</idsubdatatable> + <idsubdatatable>5</idsubdatatable> </row> <row> @@ -201,17 +201,17 @@ <row> <segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> - <idsubdatatable>8</idsubdatatable> + <idsubdatatable>6</idsubdatatable> </row> <row> <segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment> - <idsubdatatable>6</idsubdatatable> + <idsubdatatable>4</idsubdatatable> </row> <row> <segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment> - <idsubdatatable>5</idsubdatatable> + <idsubdatatable>8</idsubdatatable> </row> <row> @@ -223,12 +223,12 @@ <row> <segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment> - <idsubdatatable>12</idsubdatatable> + <idsubdatatable>11</idsubdatatable> </row> <row> <segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment> - <idsubdatatable>11</idsubdatatable> + <idsubdatatable>12</idsubdatatable> </row> <row> @@ -242,17 +242,17 @@ <row> <segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment> - <idsubdatatable>14</idsubdatatable> + <idsubdatatable>15</idsubdatatable> </row> <row> <segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment> - <idsubdatatable>13</idsubdatatable> + <idsubdatatable>14</idsubdatatable> </row> <row> <segment>eventName==Search+query+here</segment> - <idsubdatatable>15</idsubdatatable> + <idsubdatatable>13</idsubdatatable> </row> </result> <result prettyDate="Tuesday, January 5, 2010" /> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Contents.getContentNames_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Contents.getContentNames_day.xml index d77a26b3de..0a6a40ca5f 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Contents.getContentNames_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Contents.getContentNames_day.xml @@ -7,7 +7,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>5</nb_interactions> <interaction_rate>100%</interaction_rate> - <contentTarget /> <segment>contentName==content+name+20</segment> </row> <row> @@ -17,7 +16,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> - <contentTarget /> <segment>contentName==content+name+21</segment> </row> <row> @@ -27,7 +25,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>5</nb_interactions> <interaction_rate>100%</interaction_rate> - <contentTarget /> <segment>contentName==content+name+22</segment> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Contents.getContentPieces_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Contents.getContentPieces_day.xml index 05b2d79e26..203747d508 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Contents.getContentPieces_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Contents.getContentPieces_day.xml @@ -7,7 +7,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>5</nb_interactions> <interaction_rate>100%</interaction_rate> - <contentTarget /> <segment>contentPiece==content+piece+20</segment> </row> <row> @@ -17,7 +16,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> - <contentTarget /> <segment>contentPiece==content+piece+21</segment> </row> <row> @@ -27,7 +25,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>5</nb_interactions> <interaction_rate>100%</interaction_rate> - <contentTarget /> <segment>contentPiece==content+piece+22</segment> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Contents.getContentNames_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Contents.getContentNames_day.xml index 066a4135bb..375d3ca3cf 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Contents.getContentNames_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Contents.getContentNames_day.xml @@ -17,7 +17,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>5</nb_interactions> <interaction_rate>100%</interaction_rate> - <contentTarget /> <Contents_ContentName>content name 20 - content piece 20</Contents_ContentName> <segment>contentName==content+name+20</segment> </row> @@ -28,7 +27,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> - <contentTarget /> <Contents_ContentName>content name 21 - content piece 21</Contents_ContentName> <segment>contentName==content+name+21</segment> </row> @@ -39,7 +37,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>5</nb_interactions> <interaction_rate>100%</interaction_rate> - <contentTarget /> <Contents_ContentName>content name 22 - content piece 22</Contents_ContentName> <segment>contentName==content+name+22</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Contents.getContentPieces_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Contents.getContentPieces_day.xml index 296d0f4275..e59bf19f23 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Contents.getContentPieces_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Contents.getContentPieces_day.xml @@ -17,7 +17,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>5</nb_interactions> <interaction_rate>100%</interaction_rate> - <contentTarget /> <Contents_ContentPiece>content piece 20 - content name 20</Contents_ContentPiece> <segment>contentPiece==content+piece+20</segment> </row> @@ -28,7 +27,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> - <contentTarget /> <Contents_ContentPiece>content piece 21 - content name 21</Contents_ContentPiece> <segment>contentPiece==content+piece+21</segment> </row> @@ -39,7 +37,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>5</nb_interactions> <interaction_rate>100%</interaction_rate> - <contentTarget /> <Contents_ContentPiece>content piece 22 - content name 22</Contents_ContentPiece> <segment>contentPiece==content+piece+22</segment> </row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Contents.getContentNames_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Contents.getContentNames_day.xml index 8417171cd2..08c70c52e9 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Contents.getContentNames_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Contents.getContentNames_day.xml @@ -7,7 +7,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>5</nb_interactions> <interaction_rate>100%</interaction_rate> - <contentTarget /> <segment>contentName==content+name+20</segment> </row> <row> @@ -17,7 +16,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> - <contentTarget /> <segment>contentName==content+name+21</segment> </row> <row> @@ -27,7 +25,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>5</nb_interactions> <interaction_rate>100%</interaction_rate> - <contentTarget /> <segment>contentName==content+name+22</segment> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Contents.getContentPieces_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Contents.getContentPieces_day.xml index 2af5de8fd7..a15f27c035 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Contents.getContentPieces_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Contents.getContentPieces_day.xml @@ -7,7 +7,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>5</nb_interactions> <interaction_rate>100%</interaction_rate> - <contentTarget /> <segment>contentPiece==content+piece+20</segment> </row> <row> @@ -17,7 +16,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>0</nb_interactions> <interaction_rate>0%</interaction_rate> - <contentTarget /> <segment>contentPiece==content+piece+21</segment> </row> <row> @@ -27,7 +25,6 @@ <nb_impressions>5</nb_impressions> <nb_interactions>5</nb_interactions> <interaction_rate>100%</interaction_rate> - <contentTarget /> <segment>contentPiece==content+piece+22</segment> </row> <row> |