📱 Simplify naming of generated java enums IntDefs

chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/suggestions/ContentSuggestionsTestUtils.java

 // Copyright 2016 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.
 
 package org.chromium.chrome.test.util.browser.suggestions;
 
 import org.chromium.chrome.browser.ntp.cards.ItemViewType;
 import org.chromium.chrome.browser.ntp.cards.SuggestionsCategoryInfo;
 import org.chromium.chrome.browser.ntp.cards.TreeNode;
 import org.chromium.chrome.browser.ntp.snippets.CategoryInt;
 import org.chromium.chrome.browser.ntp.snippets.CategoryStatus;
 import org.chromium.chrome.browser.ntp.snippets.ContentSuggestionsCardLayout;
-import org.chromium.chrome.browser.ntp.snippets.ContentSuggestionsCardLayout.ContentSuggestionsCardLayoutEnum;
 import org.chromium.chrome.browser.ntp.snippets.SnippetArticle;
 import org.chromium.chrome.browser.suggestions.ContentSuggestionsAdditionalAction;
-import org.chromium.chrome.browser.suggestions.ContentSuggestionsAdditionalAction.ContentSuggestionsAdditionalActionEnum;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
 /** Utilities to make testing content suggestions code easier. */
 public final class ContentSuggestionsTestUtils {
     private ContentSuggestionsTestUtils() {}
 
     public static List<SnippetArticle> createDummySuggestions(
@@ skipping 74 matching lines @@
     /**
      * Uses the builder pattern to simplify constructing category info objects for tests.
      */
     public static class CategoryInfoBuilder {
         @CategoryInt
         private final int mCategory;
         private int mAdditionalAction;
         private boolean mShowIfEmpty;
         private String mTitle = "";
         private String mNoSuggestionsMessage = "";
-        @ContentSuggestionsCardLayoutEnum
+        @ContentSuggestionsCardLayout
         private int mCardLayout = ContentSuggestionsCardLayout.FULL_CARD;
 
         public CategoryInfoBuilder(@CategoryInt int category) {
             mCategory = category;
         }
 
-        public CategoryInfoBuilder withAction(@ContentSuggestionsAdditionalActionEnum int action) {
+        public CategoryInfoBuilder withAction(@ContentSuggestionsAdditionalAction int action) {
             mAdditionalAction = action;
             return this;
         }
         public CategoryInfoBuilder showIfEmpty() {
             mShowIfEmpty = true;
             return this;
         }
 
         public CategoryInfoBuilder withTitle(String title) {
             mTitle = title;
             return this;
         }
 
         public CategoryInfoBuilder withNoSuggestionsMessage(String message) {
             mNoSuggestionsMessage = message;
             return this;
         }
 
-        public CategoryInfoBuilder withCardLayout(
-                @ContentSuggestionsCardLayoutEnum int cardLayout) {
+        public CategoryInfoBuilder withCardLayout(@ContentSuggestionsCardLayout int cardLayout) {
             mCardLayout = cardLayout;
             return this;
         }
 
         public SuggestionsCategoryInfo build() {
             return new SuggestionsCategoryInfo(mCategory, mTitle, mCardLayout, mAdditionalAction,
                     mShowIfEmpty, mNoSuggestionsMessage);
         }
     }
 
@@ skipping 27 matching lines @@
                     viewTypeToString(expectedType));
         }
         addLine(stringBuilder, "explainFailedExpectation -- END --");
         return stringBuilder.toString();
     }
 
     private static void addLine(StringBuilder stringBuilder, String template, Object... args) {
         stringBuilder.append(String.format(Locale.US, template + "\n", args));
     }
 }