1 files changed, 33 insertions, 42 deletions
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java
index 44b8886..13e29f6 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifV3StyleTest.java
@@ -18,68 +18,59 @@ package com.android.setupwizardlib.util;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import android.app.Activity;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.Button;
-
-import androidx.annotation.Nullable;
-
 import com.android.setupwizardlib.R;
-import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-@RunWith(SuwLibRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(minSdk = Config.OLDEST_SDK, maxSdk = Config.NEWEST_SDK)
 public class GlifV3StyleTest {
 
-    @Test
-    public void activityWithGlifV3Theme_shouldUseLightNavBarOnV27OrAbove() {
-        GlifThemeActivity activity = Robolectric.setupActivity(GlifThemeActivity.class);
-        if (VERSION.SDK_INT >= VERSION_CODES.O_MR1) {
-            assertEquals(
-                    activity.getWindow().getNavigationBarColor(),
-                    Color.WHITE);
-            int vis = activity.getWindow().getDecorView().getSystemUiVisibility();
-            assertTrue((vis & View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR) != 0);
-        } else if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
-            assertEquals(
-                    activity.getWindow().getNavigationBarColor(),
-                    Color.BLACK);
-        }
-        // Nav bar color is not customizable pre-L
+  @Test
+  public void activityWithGlifV3Theme_shouldUseLightNavBarOnV27OrAbove() {
+    GlifThemeActivity activity = Robolectric.setupActivity(GlifThemeActivity.class);
+    if (VERSION.SDK_INT >= VERSION_CODES.O_MR1) {
+      assertThat(activity.getWindow().getNavigationBarColor()).isEqualTo(Color.WHITE);
+      int vis = activity.getWindow().getDecorView().getSystemUiVisibility();
+      assertThat((vis & View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR) != 0).isTrue();
+    } else if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
+      assertThat(activity.getWindow().getNavigationBarColor()).isEqualTo(Color.BLACK);
     }
+    // Nav bar color is not customizable pre-L
+  }
 
-    @Test
-    public void buttonWithGlifV3_shouldBeGoogleSans() {
-        GlifThemeActivity activity = Robolectric.setupActivity(GlifThemeActivity.class);
-        Button button = new Button(
-                activity,
-                Robolectric.buildAttributeSet()
-                        .setStyleAttribute("@style/SuwGlifButton.Primary")
-                        .build());
-        assertThat(button.getTypeface()).isEqualTo(Typeface.create("google-sans", 0));
-        // Button should not be all caps
-        assertThat(button.getTransformationMethod()).isNull();
-    }
+  @Test
+  public void buttonWithGlifV3_shouldBeGoogleSans() {
+    GlifThemeActivity activity = Robolectric.setupActivity(GlifThemeActivity.class);
+    Button button =
+        new Button(
+            activity,
+            Robolectric.buildAttributeSet()
+                .setStyleAttribute("@style/SuwGlifButton.Primary")
+                .build());
+    assertThat(button.getTypeface()).isEqualTo(Typeface.create("google-sans", 0));
+    // Button should not be all caps
+    assertThat(button.getTransformationMethod()).isNull();
+  }
 
-    private static class GlifThemeActivity extends Activity {
+  private static class GlifThemeActivity extends Activity {
 
-        @Override
-        protected void onCreate(@Nullable Bundle savedInstanceState) {
-            setTheme(R.style.SuwThemeGlifV3_Light);
-            super.onCreate(savedInstanceState);
-        }
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+      setTheme(R.style.SuwThemeGlifV3_Light);
+      super.onCreate(savedInstanceState);
     }
+  }
 }