Changeset 194887 in webkit


Ignore:
Timestamp:
Jan 11, 2016 11:39:16 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Web Inspector: console.count() shouldn't show a colon in front of a number
​https://bugs.webkit.org/show_bug.cgi?id=152038

Patch by Johan K. Jensen <​jj@johanjensen.dk> on 2016-01-11
Reviewed by Brian Burg.

Source/JavaScriptCore:

  • inspector/agents/InspectorConsoleAgent.cpp:

(Inspector::InspectorConsoleAgent::count):
Do not include title and colon if the title is empty.

LayoutTests:

  • inspector/console/console-api-expected.txt:
  • inspector/console/console-api.html:

Add testcases for console.count

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r194881 r194887  
     12016-01-11  Johan K. Jensen  <jj@johanjensen.dk>
     2
     3        Web Inspector: console.count() shouldn't show a colon in front of a number
     4        https://bugs.webkit.org/show_bug.cgi?id=152038
     5
     6        Reviewed by Brian Burg.
     7
     8        * inspector/console/console-api-expected.txt:
     9        * inspector/console/console-api.html:
     10        Add testcases for console.count
     11
    1122016-01-11  Joseph Pecoraro  <pecoraro@apple.com>
    213

  • trunk/LayoutTests/inspector/console/console-api-expected.txt

    r183659 r194887  
    586586  "_source": "console-api",
    587587  "_level": "debug",
    588   "_messageText": ": 1",
    589   "_type": "log",
    590   "_url": null,
    591   "_line": 1,
    592   "_column": 14,
    593   "_repeatCount": 1,
    594   "_stackTrace": "<filtered>",
    595   "_request": null
    596 }
    597 
     588  "_messageText": "<no label>: 1",
     589  "_type": "log",
     590  "_url": null,
     591  "_line": 1,
     592  "_column": 14,
     593  "_repeatCount": 1,
     594  "_stackTrace": "<filtered>",
     595  "_request": null
     596}
     597
     598STEP: console.count()
     599{
     600  "_source": "console-api",
     601  "_level": "debug",
     602  "_messageText": "<no label>: 2",
     603  "_type": "log",
     604  "_url": null,
     605  "_line": 1,
     606  "_column": 14,
     607  "_repeatCount": 1,
     608  "_stackTrace": "<filtered>",
     609  "_request": null
     610}
     611
     612STEP: console.count('')
     613{
     614  "_source": "console-api",
     615  "_level": "debug",
     616  "_messageText": "<no label>: 3",
     617  "_type": "log",
     618  "_url": null,
     619  "_line": 1,
     620  "_column": 14,
     621  "_repeatCount": 1,
     622  "_stackTrace": "<filtered>",
     623  "_request": null
     624}
     625
     626STEP: console.count('    ')
     627{
     628  "_source": "console-api",
     629  "_level": "debug",
     630  "_messageText": "    : 1",
     631  "_type": "log",
     632  "_url": null,
     633  "_line": 1,
     634  "_column": 14,
     635  "_repeatCount": 1,
     636  "_stackTrace": "<filtered>",
     637  "_request": null
     638}
     639
     640STEP: console.count('')
     641{
     642  "_source": "console-api",
     643  "_level": "debug",
     644  "_messageText": "<no label>: 4",
     645  "_type": "log",
     646  "_url": null,
     647  "_line": 1,
     648  "_column": 14,
     649  "_repeatCount": 1,
     650  "_stackTrace": "<filtered>",
     651  "_request": null
     652}
     653
     654STEP: console.count('    ')
     655{
     656  "_source": "console-api",
     657  "_level": "debug",
     658  "_messageText": "    : 2",
     659  "_type": "log",
     660  "_url": null,
     661  "_line": 1,
     662  "_column": 14,
     663  "_repeatCount": 1,
     664  "_stackTrace": "<filtered>",
     665  "_request": null
     666}
     667
     668STEP: console.count(string)
     669{
     670  "_source": "console-api",
     671  "_level": "debug",
     672  "_messageText": "string: 1",
     673  "_type": "log",
     674  "_url": null,
     675  "_line": 1,
     676  "_column": 14,
     677  "_repeatCount": 1,
     678  "_stackTrace": "<filtered>",
     679  "_request": null
     680}
     681
     682STEP: console.count(string)
     683{
     684  "_source": "console-api",
     685  "_level": "debug",
     686  "_messageText": "string: 2",
     687  "_type": "log",
     688  "_url": null,
     689  "_line": 1,
     690  "_column": 14,
     691  "_repeatCount": 1,
     692  "_stackTrace": "<filtered>",
     693  "_request": null
     694}
     695
     696STEP: console.count(object)
     697{
     698  "_source": "console-api",
     699  "_level": "debug",
     700  "_messageText": "[object Object]: 1",
     701  "_type": "log",
     702  "_url": null,
     703  "_line": 1,
     704  "_column": 14,
     705  "_repeatCount": 1,
     706  "_stackTrace": "<filtered>",
     707  "_request": null
     708}
     709
     710STEP: console.count(object)
     711{
     712  "_source": "console-api",
     713  "_level": "debug",
     714  "_messageText": "[object Object]: 2",
     715  "_type": "log",
     716  "_url": null,
     717  "_line": 1,
     718  "_column": 14,
     719  "_repeatCount": 1,
     720  "_stackTrace": "<filtered>",
     721  "_request": null
     722}
     723
     724STEP: console.count(otherObject)
     725{
     726  "_source": "console-api",
     727  "_level": "debug",
     728  "_messageText": "[object Object]: 3",
     729  "_type": "log",
     730  "_url": null,
     731  "_line": 1,
     732  "_column": 14,
     733  "_repeatCount": 1,
     734  "_stackTrace": "<filtered>",
     735  "_request": null
     736}
     737
     738STEP: console.count(otherObject)
     739{
     740  "_source": "console-api",
     741  "_level": "debug",
     742  "_messageText": "[object Object]: 4",
     743  "_type": "log",
     744  "_url": null,
     745  "_line": 1,
     746  "_column": 14,
     747  "_repeatCount": 1,
     748  "_stackTrace": "<filtered>",
     749  "_request": null
     750}
     751
     752STEP: console.count(number)
     753{
     754  "_source": "console-api",
     755  "_level": "debug",
     756  "_messageText": "42: 1",
     757  "_type": "log",
     758  "_url": null,
     759  "_line": 1,
     760  "_column": 14,
     761  "_repeatCount": 1,
     762  "_stackTrace": "<filtered>",
     763  "_request": null
     764}
     765
     766STEP: console.count(number)
     767{
     768  "_source": "console-api",
     769  "_level": "debug",
     770  "_messageText": "42: 2",
     771  "_type": "log",
     772  "_url": null,
     773  "_line": 1,
     774  "_column": 14,
     775  "_repeatCount": 1,
     776  "_stackTrace": "<filtered>",
     777  "_request": null
     778}
     779

  • trunk/LayoutTests/inspector/console/console-api.html

    r188059 r194887  
    77var string = "string";
    88var object = {a:1};
     9var otherObject = {b:2};
     10var number = 42;
    911
    1012function test()
    … …  
    3234        "console.groupEnd('collapsedGroupName')",
    3335        "console.count()",
     36        "console.count()",
     37        "console.count('')",
     38        "console.count('    ')",
     39        "console.count('')",
     40        "console.count('    ')",
     41        "console.count(string)",
     42        "console.count(string)",
     43        "console.count(object)",
     44        "console.count(object)",
     45        "console.count(otherObject)",
     46        "console.count(otherObject)",
     47        "console.count(number)",
     48        "console.count(number)",
    3449    ];
    3550

  • trunk/Source/JavaScriptCore/ChangeLog

    r194884 r194887  
     12016-01-11  Johan K. Jensen  <jj@johanjensen.dk>
     2
     3        Web Inspector: console.count() shouldn't show a colon in front of a number
     4        https://bugs.webkit.org/show_bug.cgi?id=152038
     5
     6        Reviewed by Brian Burg.
     7
     8        * inspector/agents/InspectorConsoleAgent.cpp:
     9        (Inspector::InspectorConsoleAgent::count):
     10        Do not include title and colon if the title is empty.
     11
    1122016-01-11  Dan Bernstein  <mitz@apple.com>
    213

  • trunk/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.cpp

    r194496 r194887  
    175175    m_counts.add(identifier, count);
    176176
    177     String message = title + ": " + String::number(count);
     177    String message;
     178    if (title.isEmpty())
     179        message = "<no label>: " + String::number(count);
     180    else
     181        message = title + ": " + String::number(count);
     182
    178183    addMessageToConsole(std::make_unique<ConsoleMessage>(MessageSource::ConsoleAPI, MessageType::Log, MessageLevel::Debug, message, callStack));
    179184}
Note: See TracChangeset for help on using the changeset viewer.