1 files changed, 76 insertions, 78 deletions
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java
index c10c122..a0c688c 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/util/GlifDimensionTest.java
@@ -16,7 +16,7 @@
 
 package com.android.setupwizardlib.util;
 
-import static org.junit.Assert.assertEquals;
+import static com.google.common.truth.Truth.assertWithMessage;
 import static org.robolectric.RuntimeEnvironment.application;
 
 import android.content.Context;
@@ -25,90 +25,88 @@ import android.content.res.TypedArray;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.ContextThemeWrapper;
-
 import com.android.setupwizardlib.R;
-import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-@RunWith(SuwLibRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(sdk = Config.ALL_SDKS)
 public class GlifDimensionTest {
 
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = new ContextThemeWrapper(application, R.style.SuwThemeGlif_Light);
-    }
-
-    @Test
-    public void testDividerInsetPhone() {
-        assertDividerInset();
-    }
-
-    @Config(qualifiers = "sw600dp")
-    @Test
-    public void testDividerInsetSw600dp() {
-        assertDividerInset();
-    }
-
-    private void assertDividerInset() {
-        final Resources res = mContext.getResources();
-
-        final TypedArray a = mContext.obtainStyledAttributes(new int[]{R.attr.suwMarginSides});
-        final int marginSides = a.getDimensionPixelSize(0, 0);
-        a.recycle();
-
-        assertEquals(
-                "Dimensions should satisfy constraint: "
-                        + "?attr/suwMarginSides = suw_items_glif_text_divider_inset",
-                marginSides,
-                res.getDimensionPixelSize(R.dimen.suw_items_glif_text_divider_inset));
-
-        assertEquals(
-                "Dimensions should satisfy constraint: ?attr/suwMarginSides + "
-                        + "suw_items_icon_container_width = suw_items_glif_icon_divider_inset",
-                marginSides + res.getDimensionPixelSize(R.dimen.suw_items_icon_container_width),
-                res.getDimensionPixelSize(R.dimen.suw_items_glif_icon_divider_inset));
-    }
-
-    @Test
-    public void testButtonMargin() {
-        assertButtonMargin();
-    }
-
-    @Config(qualifiers = "sw600dp")
-    @Test
-    public void testButtonMarginSw600dp() {
-        assertButtonMargin();
-    }
-
-    private void assertButtonMargin() {
-        final Resources res = mContext.getResources();
-
-        final TypedArray a = mContext.obtainStyledAttributes(new int[]{R.attr.suwMarginSides});
-        final int marginSides = a.getDimensionPixelSize(0, 0);
-        a.recycle();
-
-        assertEquals(
-                "Dimensions should satisfy constraint: ?attr/suwMarginSides - "
-                        + "4dp (internal padding of button) = suw_glif_button_margin_end",
-                marginSides - dp2Px(4),
-                res.getDimensionPixelSize(R.dimen.suw_glif_button_margin_end));
-
-        assertEquals(
-                "Dimensions should satisfy constraint: ?attr/suwMarginSides - "
-                        + "suw_glif_button_padding = suw_glif_button_margin_start",
-                marginSides - res.getDimensionPixelSize(R.dimen.suw_glif_button_padding),
-                res.getDimensionPixelSize(R.dimen.suw_glif_button_margin_start));
-    }
-
-    private int dp2Px(float dp) {
-        DisplayMetrics displayMetrics = mContext.getResources().getDisplayMetrics();
-        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, displayMetrics);
-    }
+  private Context context;
+
+  @Before
+  public void setUp() {
+    context = new ContextThemeWrapper(application, R.style.SuwThemeGlif_Light);
+  }
+
+  @Test
+  public void testDividerInsetPhone() {
+    assertDividerInset();
+  }
+
+  @Config(qualifiers = "sw600dp")
+  @Test
+  public void testDividerInsetSw600dp() {
+    assertDividerInset();
+  }
+
+  private void assertDividerInset() {
+    final Resources res = context.getResources();
+
+    final TypedArray a = context.obtainStyledAttributes(new int[] {R.attr.suwMarginSides});
+    final int marginSides = a.getDimensionPixelSize(0, 0);
+    a.recycle();
+
+    assertWithMessage(
+            "Dimensions should satisfy constraint: "
+                + "?attr/suwMarginSides = suw_items_glif_text_divider_inset")
+        .that(res.getDimensionPixelSize(R.dimen.suw_items_glif_text_divider_inset))
+        .isEqualTo(marginSides);
+
+    assertWithMessage(
+            "Dimensions should satisfy constraint: ?attr/suwMarginSides + "
+                + "suw_items_icon_container_width = suw_items_glif_icon_divider_inset")
+        .that(res.getDimensionPixelSize(R.dimen.suw_items_glif_icon_divider_inset))
+        .isEqualTo(marginSides + res.getDimensionPixelSize(R.dimen.suw_items_icon_container_width));
+  }
+
+  @Test
+  public void testButtonMargin() {
+    assertButtonMargin();
+  }
+
+  @Config(qualifiers = "sw600dp")
+  @Test
+  public void testButtonMarginSw600dp() {
+    assertButtonMargin();
+  }
+
+  private void assertButtonMargin() {
+    final Resources res = context.getResources();
+
+    final TypedArray a = context.obtainStyledAttributes(new int[] {R.attr.suwMarginSides});
+    final int marginSides = a.getDimensionPixelSize(0, 0);
+    a.recycle();
+
+    assertWithMessage(
+            "Dimensions should satisfy constraint: ?attr/suwMarginSides - "
+                + "4dp (internal padding of button) = suw_glif_button_margin_end")
+        .that(res.getDimensionPixelSize(R.dimen.suw_glif_button_margin_end))
+        .isEqualTo(marginSides - dp2Px(4));
+
+    assertWithMessage(
+            "Dimensions should satisfy constraint: ?attr/suwMarginSides - "
+                + "suw_glif_button_padding = suw_glif_button_margin_start")
+        .that(res.getDimensionPixelSize(R.dimen.suw_glif_button_margin_start))
+        .isEqualTo(marginSides - res.getDimensionPixelSize(R.dimen.suw_glif_button_padding));
+  }
+
+  private int dp2Px(float dp) {
+    DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+    return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, displayMetrics);
+  }
 }