Replace format test with annotator test

Author: gedare

clang/unittests/Format/FormatTest.cpp

@@ -12415,18 +12415,6 @@ TEST_F(FormatTest, UnderstandsAttributes) {
   verifyFormat("SomeType s __unused{InitValue};", CustomAttrs);
   verifyFormat("SomeType *__capability s(InitValue);", CustomAttrs);
   verifyFormat("SomeType *__capability s{InitValue};", CustomAttrs);
-
-  FormatStyle Style = getLLVMStyle(FormatStyle::LK_Cpp);
-  verifyFormat(
-      "template <>\n"
-      "struct __declspec(uuid(\"3895C200-8F26-4F5A-B29D-2B5D72E68F99\"))\n"
-      "IAsyncOperation<IUnknown *> : IAsyncOperation_impl<IUnknown *> {};",
-      Style);
-  verifyFormat(
-      "template <>\n"
-      "class __declspec(uuid(\"3895C200-8F26-4F5A-B29D-2B5D72E68F99\"))\n"
-      "IAsyncOperation<IUnknown *> : IAsyncOperation_impl<IUnknown *> {};",
-      Style);
 }
 
 TEST_F(FormatTest, UnderstandsPointerQualifiersInCast) {

clang/unittests/Format/TokenAnnotatorTest.cpp

@@ -3123,6 +3123,15 @@ TEST_F(TokenAnnotatorTest, UnderstandsAttributes) {
   EXPECT_TOKEN(Tokens[7], tok::identifier, TT_FunctionDeclarationName);
   EXPECT_TOKEN(Tokens[8], tok::l_paren, TT_FunctionDeclarationLParen);
 
+  Tokens = annotate("struct __attribute__((x)) foo {};");
+  ASSERT_EQ(Tokens.size(), 12u) << Tokens;
+  EXPECT_TOKEN(Tokens[2], tok::l_paren, TT_AttributeLParen);
+  EXPECT_TOKEN(Tokens[3], tok::l_paren, TT_Unknown);
+  EXPECT_TOKEN(Tokens[5], tok::r_paren, TT_Unknown);
+  EXPECT_TOKEN(Tokens[6], tok::r_paren, TT_AttributeRParen);
+  EXPECT_TOKEN(Tokens[7], tok::identifier, TT_Unknown);
+  EXPECT_TOKEN(Tokens[8], tok::l_brace, TT_StructLBrace);
+
   FormatStyle Style = getLLVMStyle();
   Style.AttributeMacros.push_back("FOO");
   Tokens = annotate("bool foo FOO(unused);", Style);