1 files changed, 61 insertions, 68 deletions
diff --git a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java
index f5b8253..7f51fa7 100644
--- a/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java
+++ b/library/gingerbread/test/instrumentation/src/com/android/setupwizardlib/items/ButtonItemDrawingTest.java
@@ -18,19 +18,16 @@ package com.android.setupwizardlib.items;
 
 import static org.junit.Assert.assertTrue;
 
+import androidx.annotation.StyleRes;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.LinearLayout;
 import android.support.test.annotation.UiThreadTest;
 import android.support.test.filters.SmallTest;
 import android.support.test.rule.UiThreadTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
-
-import androidx.annotation.StyleRes;
-
 import com.android.setupwizardlib.R;
 import com.android.setupwizardlib.test.util.DrawingTestHelper;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -39,69 +36,65 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 public class ButtonItemDrawingTest {
 
-    private static final int GLIF_ACCENT_COLOR = 0xff4285f4;
-    private static final int GLIF_V3_ACCENT_COLOR = 0xff1a73e8;
-
-    // These tests need to be run on UI thread because button uses ValueAnimator
-    @Rule
-    public UiThreadTestRule mUiThreadTestRule = new UiThreadTestRule();
-
-    @Test
-    @UiThreadTest
-    public void drawButton_glif_shouldHaveAccentColoredButton()
-            throws InstantiationException, IllegalAccessException {
-        Button button = createButton(R.style.SuwThemeGlif_Light);
-
-        DrawingTestHelper drawingTestHelper = new DrawingTestHelper(50, 50);
-        drawingTestHelper.drawView(button);
-
-        int accentPixelCount =
-                countPixelsWithColor(drawingTestHelper.getPixels(), GLIF_ACCENT_COLOR);
-        assertTrue("> 10 pixels should be #4285f4. Found " + accentPixelCount,
-                accentPixelCount > 10);
-    }
-
-    @Test
-    @UiThreadTest
-    public void drawButton_glifV3_shouldHaveAccentColoredButton()
-            throws InstantiationException, IllegalAccessException {
-        Button button = createButton(R.style.SuwThemeGlifV3_Light);
-
-        DrawingTestHelper drawingTestHelper = new DrawingTestHelper(50, 50);
-        drawingTestHelper.drawView(button);
-
-        int accentPixelCount =
-                countPixelsWithColor(drawingTestHelper.getPixels(), GLIF_V3_ACCENT_COLOR);
-        assertTrue("> 10 pixels should be #1a73e8. Found " + accentPixelCount,
-                accentPixelCount > 10);
-    }
-
-    private Button createButton(@StyleRes int theme)
-            throws InstantiationException, IllegalAccessException {
-        final ViewGroup parent = new LinearLayout(DrawingTestHelper.createCanvasActivity(theme));
-        TestButtonItem item = new TestButtonItem();
-        item.setTheme(R.style.SuwButtonItem_Colored);
-        item.setText("foobar");
-
-        return item.createButton(parent);
-    }
-
-    private int countPixelsWithColor(int[] pixels, int color) {
-        int count = 0;
-        for (int pixel : pixels) {
-            if (pixel == color) {
-                count++;
-            }
-        }
-        return count;
+  private static final int GLIF_ACCENT_COLOR = 0xff4285f4;
+  private static final int GLIF_V3_ACCENT_COLOR = 0xff1a73e8;
+
+  // These tests need to be run on UI thread because button uses ValueAnimator
+  @Rule public UiThreadTestRule mUiThreadTestRule = new UiThreadTestRule();
+
+  @Test
+  @UiThreadTest
+  public void drawButton_glif_shouldHaveAccentColoredButton()
+      throws InstantiationException, IllegalAccessException {
+    Button button = createButton(R.style.SuwThemeGlif_Light);
+
+    DrawingTestHelper drawingTestHelper = new DrawingTestHelper(50, 50);
+    drawingTestHelper.drawView(button);
+
+    int accentPixelCount = countPixelsWithColor(drawingTestHelper.getPixels(), GLIF_ACCENT_COLOR);
+    assertTrue("> 10 pixels should be #4285f4. Found " + accentPixelCount, accentPixelCount > 10);
+  }
+
+  @Test
+  @UiThreadTest
+  public void drawButton_glifV3_shouldHaveAccentColoredButton()
+      throws InstantiationException, IllegalAccessException {
+    Button button = createButton(R.style.SuwThemeGlifV3_Light);
+
+    DrawingTestHelper drawingTestHelper = new DrawingTestHelper(50, 50);
+    drawingTestHelper.drawView(button);
+
+    int accentPixelCount =
+        countPixelsWithColor(drawingTestHelper.getPixels(), GLIF_V3_ACCENT_COLOR);
+    assertTrue("> 10 pixels should be #1a73e8. Found " + accentPixelCount, accentPixelCount > 10);
+  }
+
+  private Button createButton(@StyleRes int theme)
+      throws InstantiationException, IllegalAccessException {
+    final ViewGroup parent = new LinearLayout(DrawingTestHelper.createCanvasActivity(theme));
+    TestButtonItem item = new TestButtonItem();
+    item.setTheme(R.style.SuwButtonItem_Colored);
+    item.setText("foobar");
+
+    return item.createButton(parent);
+  }
+
+  private int countPixelsWithColor(int[] pixels, int color) {
+    int count = 0;
+    for (int pixel : pixels) {
+      if (pixel == color) {
+        count++;
+      }
     }
+    return count;
+  }
 
-    private static class TestButtonItem extends ButtonItem {
+  private static class TestButtonItem extends ButtonItem {
 
-        @Override
-        public Button createButton(ViewGroup parent) {
-            // Make this method public for testing
-            return super.createButton(parent);
-        }
+    @Override
+    public Button createButton(ViewGroup parent) {
+      // Make this method public for testing
+      return super.createButton(parent);
     }
+  }
 }