1 files changed, 52 insertions, 51 deletions
diff --git a/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java b/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java
index ae4f3d1..001f1da 100644
--- a/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java
+++ b/library/test/robotest/src/com/android/setupwizardlib/view/FillContentLayoutTest.java
@@ -16,72 +16,73 @@
 
 package com.android.setupwizardlib.view;
 
-import static org.junit.Assert.assertEquals;
+import static com.google.common.truth.Truth.assertThat;
 import static org.robolectric.RuntimeEnvironment.application;
 
 import android.view.View;
 import android.view.View.MeasureSpec;
-
-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(sdk = {Config.OLDEST_SDK, Config.NEWEST_SDK})
 public class FillContentLayoutTest {
 
-    @Test
-    public void testMeasureMinSize() {
-        FillContentLayout layout = new FillContentLayout(
-                application,
-                Robolectric.buildAttributeSet()
-                        .addAttribute(android.R.attr.minWidth, "123dp")
-                        .addAttribute(android.R.attr.minHeight, "123dp")
-                        .build());
-        layout.measure(
-                MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
-                MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
+  @Test
+  public void testMeasureMinSize() {
+    FillContentLayout layout =
+        new FillContentLayout(
+            application,
+            Robolectric.buildAttributeSet()
+                .addAttribute(android.R.attr.minWidth, "123dp")
+                .addAttribute(android.R.attr.minHeight, "123dp")
+                .build());
+    layout.measure(
+        MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED),
+        MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
 
-        assertEquals(123, layout.getMeasuredWidth());
-        assertEquals(123, layout.getMeasuredHeight());
-    }
+    assertThat(layout.getMeasuredWidth()).isEqualTo(123);
+    assertThat(layout.getMeasuredHeight()).isEqualTo(123);
+  }
 
-    @Test
-    public void testMeasureChildIsSmallerThanMaxSize() {
-        View child = new View(application);
-        FillContentLayout layout = new FillContentLayout(
-                application,
-                Robolectric.buildAttributeSet()
-                        .addAttribute(android.R.attr.maxWidth, "123dp")
-                        .addAttribute(android.R.attr.maxHeight, "123dp")
-                        .build());
-        layout.addView(child);
-        layout.measure(
-                MeasureSpec.makeMeasureSpec(300, MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(300, MeasureSpec.EXACTLY));
+  @Test
+  public void testMeasureChildIsSmallerThanMaxSize() {
+    View child = new View(application);
+    FillContentLayout layout =
+        new FillContentLayout(
+            application,
+            Robolectric.buildAttributeSet()
+                .addAttribute(android.R.attr.maxWidth, "123dp")
+                .addAttribute(android.R.attr.maxHeight, "123dp")
+                .build());
+    layout.addView(child);
+    layout.measure(
+        MeasureSpec.makeMeasureSpec(300, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(300, MeasureSpec.EXACTLY));
 
-        assertEquals(123, child.getMeasuredWidth());
-        assertEquals(123, child.getMeasuredHeight());
-    }
+    assertThat(child.getMeasuredWidth()).isEqualTo(123);
+    assertThat(child.getMeasuredHeight()).isEqualTo(123);
+  }
 
-    @Test
-    public void testMeasureChildIsSmallerThanParent() {
-        View child = new View(application);
-        FillContentLayout layout = new FillContentLayout(
-                application,
-                Robolectric.buildAttributeSet()
-                        .addAttribute(android.R.attr.maxWidth, "123dp")
-                        .addAttribute(android.R.attr.maxHeight, "123dp")
-                        .build());
-        layout.addView(child);
-        layout.measure(
-                MeasureSpec.makeMeasureSpec(88, MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(88, MeasureSpec.EXACTLY));
+  @Test
+  public void testMeasureChildIsSmallerThanParent() {
+    View child = new View(application);
+    FillContentLayout layout =
+        new FillContentLayout(
+            application,
+            Robolectric.buildAttributeSet()
+                .addAttribute(android.R.attr.maxWidth, "123dp")
+                .addAttribute(android.R.attr.maxHeight, "123dp")
+                .build());
+    layout.addView(child);
+    layout.measure(
+        MeasureSpec.makeMeasureSpec(88, MeasureSpec.EXACTLY),
+        MeasureSpec.makeMeasureSpec(88, MeasureSpec.EXACTLY));
 
-        assertEquals(88, child.getMeasuredWidth());
-        assertEquals(88, child.getMeasuredHeight());
-    }
+    assertThat(child.getMeasuredWidth()).isEqualTo(88);
+    assertThat(child.getMeasuredHeight()).isEqualTo(88);
+  }
 }