ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions).

third_party/WebKit/Source/core/css/parser/CSSTokenizerTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/parser/CSSTokenizer.h"
 
 #include "core/css/parser/CSSParserTokenRange.h"
 #include "core/css/parser/MediaQueryBlockWatcher.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/allocator/Partitions.h"
@@ skipping 147 matching lines @@
 DEFINE_TOKEN(badString, (BadStringToken));
 DEFINE_TOKEN(badUrl, (BadUrlToken));
 
 String fromUChar32(UChar32 c) {
   StringBuilder input;
   input.append(c);
   return input.toString();
 }
 
 TEST(CSSTokenizerTest, SingleCharacterTokens) {
-  TEST_TOKENS("(", leftParenthesis());
-  TEST_TOKENS(")", rightParenthesis());
-  TEST_TOKENS("[", leftBracket());
-  TEST_TOKENS("]", rightBracket());
+  TEST_TOKENS("(", left_parenthesis());
+  TEST_TOKENS(")", right_parenthesis());
+  TEST_TOKENS("[", left_bracket());
+  TEST_TOKENS("]", right_bracket());

[Łukasz Anforowicz, 2017/01/04 22:11:24]

Not sure why the tool didn't rename things here.

Maybe because TEST_TOKENS uses variadic arguments: #define TEST_TOKENS(string,
...)

Maybe because leftParenthesis is defined via a macro: #define DEFINE_TOKEN(name,
argument)

   TEST_TOKENS(",", comma());
   TEST_TOKENS(":", colon());
   TEST_TOKENS(";", semicolon());
-  TEST_TOKENS(")[", rightParenthesis(), leftBracket());
-  TEST_TOKENS("[)", leftBracket(), rightParenthesis());
-  TEST_TOKENS("{}", leftBrace(), rightBrace());
+  TEST_TOKENS(")[", right_parenthesis(), left_bracket());
+  TEST_TOKENS("[)", left_bracket(), right_parenthesis());
+  TEST_TOKENS("{}", left_brace(), right_brace());
   TEST_TOKENS(",,", comma(), comma());
 }
 
 TEST(CSSTokenizerTest, MultipleCharacterTokens) {
-  TEST_TOKENS("~=", includeMatch());
-  TEST_TOKENS("|=", dashMatch());
-  TEST_TOKENS("^=", prefixMatch());
-  TEST_TOKENS("$=", suffixMatch());
-  TEST_TOKENS("*=", substringMatch());
+  TEST_TOKENS("~=", include_match());
+  TEST_TOKENS("|=", dash_match());
+  TEST_TOKENS("^=", prefix_match());
+  TEST_TOKENS("$=", suffix_match());
+  TEST_TOKENS("*=", substring_match());
   TEST_TOKENS("||", column());
   TEST_TOKENS("|||", column(), delim('|'));
   TEST_TOKENS("<!--", cdo());
   TEST_TOKENS("<!---", cdo(), delim('-'));
   TEST_TOKENS("-->", cdc());
 }
 
 TEST(CSSTokenizerTest, DelimiterToken) {
   TEST_TOKENS("^", delim('^'));
   TEST_TOKENS("*", delim('*'));
@@ skipping 69 matching lines @@
               ident(fromUChar32(0xA0)));  // non-breaking space
   TEST_TOKENS(fromUChar32(0x1234), ident(fromUChar32(0x1234)));
   TEST_TOKENS(fromUChar32(0x12345), ident(fromUChar32(0x12345)));
   TEST_TOKENS(String("\0", 1), ident(fromUChar32(0xFFFD)));
   TEST_TOKENS(String("ab\0c", 4), ident("ab" + fromUChar32(0xFFFD) + "c"));
   TEST_TOKENS(String("ab\0c", 4), ident("ab" + fromUChar32(0xFFFD) + "c"));
 }
 
 TEST(CSSTokenizerTest, FunctionToken) {
   TEST_TOKENS("scale(2)", function("scale"),
-              number(IntegerValueType, 2, NoSign), rightParenthesis());
+              number(kIntegerValueType, 2, kNoSign), right_parenthesis());
   TEST_TOKENS("foo-bar\\ baz(", function("foo-bar baz"));
   TEST_TOKENS("fun\\(ction(", function("fun(ction"));
   TEST_TOKENS("-foo(", function("-foo"));
   TEST_TOKENS("url(\"foo.gif\"", function("url"), string("foo.gif"));
   TEST_TOKENS("foo(  \'bar.gif\'", function("foo"), whitespace(),
               string("bar.gif"));
   // To simplify implementation we drop the whitespace in
   // function(url),whitespace,string()
   TEST_TOKENS("url(  \'bar.gif\'", function("url"), string("bar.gif"));
 }
@@ skipping 20 matching lines @@
               url("https://example.com/cats.png"));
   TEST_TOKENS("uRl(what-a.crazy^URL~this\\ is!)",
               url("what-a.crazy^URL~this is!"));
   TEST_TOKENS("uRL(123#test)", url("123#test"));
   TEST_TOKENS("Url(escapes\\ \\\"\\'\\)\\()", url("escapes \"')("));
   TEST_TOKENS("UrL(   whitespace   )", url("whitespace"));
   TEST_TOKENS("URl( whitespace-eof ", url("whitespace-eof"));
   TEST_TOKENS("URL(eof", url("eof"));
   TEST_TOKENS("url(not/*a*/comment)", url("not/*a*/comment"));
   TEST_TOKENS("urL()", url(""));
-  TEST_TOKENS("uRl(white space),", badUrl(), comma());
-  TEST_TOKENS("Url(b(ad),", badUrl(), comma());
-  TEST_TOKENS("uRl(ba'd):", badUrl(), colon());
-  TEST_TOKENS("urL(b\"ad):", badUrl(), colon());
-  TEST_TOKENS("uRl(b\"ad):", badUrl(), colon());
-  TEST_TOKENS("Url(b\\\rad):", badUrl(), colon());
-  TEST_TOKENS("url(b\\\nad):", badUrl(), colon());
-  TEST_TOKENS("url(/*'bad')*/", badUrl(), delim('*'), delim('/'));
-  TEST_TOKENS("url(ba'd\\\\))", badUrl(), rightParenthesis());
+  TEST_TOKENS("uRl(white space),", bad_url(), comma());
+  TEST_TOKENS("Url(b(ad),", bad_url(), comma());
+  TEST_TOKENS("uRl(ba'd):", bad_url(), colon());
+  TEST_TOKENS("urL(b\"ad):", bad_url(), colon());
+  TEST_TOKENS("uRl(b\"ad):", bad_url(), colon());
+  TEST_TOKENS("Url(b\\\rad):", bad_url(), colon());
+  TEST_TOKENS("url(b\\\nad):", bad_url(), colon());
+  TEST_TOKENS("url(/*'bad')*/", bad_url(), delim('*'), delim('/'));
+  TEST_TOKENS("url(ba'd\\\\))", bad_url(), right_parenthesis());
 }
 
 TEST(CSSTokenizerTest, StringToken) {
   TEST_TOKENS("'text'", string("text"));
   TEST_TOKENS("\"text\"", string("text"));
   TEST_TOKENS("'testing, 123!'", string("testing, 123!"));
   TEST_TOKENS("'es\\'ca\\\"pe'", string("es'ca\"pe"));
   TEST_TOKENS("'\"quotes\"'", string("\"quotes\""));
   TEST_TOKENS("\"'quotes'\"", string("'quotes'"));
   TEST_TOKENS("\"mismatch'", string("mismatch'"));
   TEST_TOKENS("'text\5\t\13'", string("text\5\t\13"));
   TEST_TOKENS("\"end on eof", string("end on eof"));
   TEST_TOKENS("'esca\\\nped'", string("escaped"));
   TEST_TOKENS("\"esc\\\faped\"", string("escaped"));
   TEST_TOKENS("'new\\\rline'", string("newline"));
   TEST_TOKENS("\"new\\\r\nline\"", string("newline"));
-  TEST_TOKENS("'bad\nstring", badString(), whitespace(), ident("string"));
-  TEST_TOKENS("'bad\rstring", badString(), whitespace(), ident("string"));
-  TEST_TOKENS("'bad\r\nstring", badString(), whitespace(), ident("string"));
-  TEST_TOKENS("'bad\fstring", badString(), whitespace(), ident("string"));
+  TEST_TOKENS("'bad\nstring", bad_string(), whitespace(), ident("string"));
+  TEST_TOKENS("'bad\rstring", bad_string(), whitespace(), ident("string"));
+  TEST_TOKENS("'bad\r\nstring", bad_string(), whitespace(), ident("string"));
+  TEST_TOKENS("'bad\fstring", bad_string(), whitespace(), ident("string"));
   TEST_TOKENS(String("'\0'", 3), string(fromUChar32(0xFFFD)));
   TEST_TOKENS(String("'hel\0lo'", 8),
               string("hel" + fromUChar32(0xFFFD) + "lo"));
   TEST_TOKENS(String("'h\\65l\0lo'", 10),
               string("hel" + fromUChar32(0xFFFD) + "lo"));
 }
 
 TEST(CSSTokenizerTest, HashToken) {
   TEST_TOKENS("#id-selector", hash("id-selector", HashTokenId));
   TEST_TOKENS("#FF7700", hash("FF7700", HashTokenId));
@@ skipping 89 matching lines @@
   TEST_TOKENS("u+z", ident("u"), delim('+'), ident("z"));
   TEST_TOKENS("u+", ident("u"), delim('+'));
   TEST_TOKENS("u+-543", ident("u"), delim('+'),
               number(IntegerValueType, -543, MinusSign));
 }
 
 TEST(CSSTokenizerTest, CommentToken) {
   TEST_TOKENS("/*comment*/a", ident("a"));
   TEST_TOKENS("/**\\2f**//", delim('/'));
   TEST_TOKENS("/**y*a*y**/ ", whitespace());
-  TEST_TOKENS(",/* \n :) \n */)", comma(), rightParenthesis());
+  TEST_TOKENS(",/* \n :) \n */)", comma(), right_parenthesis());
   TEST_TOKENS(":/*/*/", colon());
   TEST_TOKENS("/**/*", delim('*'));
   TEST_TOKENS(";/******", semicolon());
 }
 
 typedef struct {
   const char* input;
   const unsigned maxLevel;
   const unsigned finalLevel;
 } BlockTestCase;
@@ skipping 39 matching lines @@
       blockWatcher.handleToken(range.consume());
       level = blockWatcher.blockLevel();
       maxLevel = std::max(level, maxLevel);
     }
     ASSERT_EQ(testCases[i].maxLevel, maxLevel);
     ASSERT_EQ(testCases[i].finalLevel, level);
   }
 }
 
 }  // namespace blink