1 files changed, 56 insertions, 60 deletions
diff --git a/library/test/instrumentation/src/com/android/setupwizardlib/test/ItemAdapterTest.java b/library/test/instrumentation/src/com/android/setupwizardlib/test/ItemAdapterTest.java
index e5875e4..63180dc 100644
--- a/library/test/instrumentation/src/com/android/setupwizardlib/test/ItemAdapterTest.java
+++ b/library/test/instrumentation/src/com/android/setupwizardlib/test/ItemAdapterTest.java
@@ -24,78 +24,74 @@ import static org.mockito.Mockito.mock;
 import android.database.DataSetObserver;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
-
 import com.android.setupwizardlib.items.Item;
 import com.android.setupwizardlib.items.ItemAdapter;
 import com.android.setupwizardlib.items.ItemGroup;
 import com.android.setupwizardlib.items.ItemHierarchy;
-
+import java.util.Arrays;
+import java.util.HashSet;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InOrder;
 
-import java.util.Arrays;
-import java.util.HashSet;
-
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public class ItemAdapterTest {
 
-    private Item[] mItems = new Item[5];
-    private ItemGroup mItemGroup = new ItemGroup();
-
-    @Before
-    public void setUp() throws Exception {
-        for (int i = 0; i < 5; i++) {
-            Item item = new Item();
-            item.setTitle("TestTitle" + i);
-            item.setId(i);
-            item.setLayoutResource(((i % 3) + 1) * 10);
-            mItems[i] = item;
-            mItemGroup.addChild(item);
-        }
-    }
-
-    @Test
-    public void testAdapter() {
-        ItemAdapter adapter = new ItemAdapter(mItemGroup);
-        assertEquals("Adapter should have 5 items", 5, adapter.getCount());
-        assertEquals("Adapter should return the first item", mItems[0], adapter.getItem(0));
-        assertEquals("ID should be same as position", 2, adapter.getItemId(2));
-
-        // Each test item has its own layout resource, and therefore its own view type
-        assertEquals("Should have 3 different view types", 3, adapter.getViewTypeCount());
-        HashSet<Integer> viewTypes = new HashSet<>(3);
-        viewTypes.add(adapter.getItemViewType(0));
-        viewTypes.add(adapter.getItemViewType(1));
-        viewTypes.add(adapter.getItemViewType(2));
-
-        assertEquals("View types should be 0, 1, 2",
-                new HashSet<>(Arrays.asList(0, 1, 2)), viewTypes);
-    }
-
-    @Test
-    public void testGetRootItemHierarchy() {
-        ItemAdapter adapter = new ItemAdapter(mItemGroup);
-        ItemHierarchy root = adapter.getRootItemHierarchy();
-        assertSame("Root item hierarchy should be mItemGroup", mItemGroup, root);
-    }
-
-    @Test
-    public void testAdapterNotifications() {
-        ItemAdapter adapter = new ItemAdapter(mItemGroup);
-        final DataSetObserver observer = mock(DataSetObserver.class);
-        adapter.registerDataSetObserver(observer);
-        final InOrder inOrder = inOrder(observer);
-
-        mItems[0].setTitle("Child 1");
-        inOrder.verify(observer).onChanged();
-
-        mItemGroup.removeChild(mItems[1]);
-        inOrder.verify(observer).onChanged();
-
-        mItemGroup.addChild(mItems[1]);
-        inOrder.verify(observer).onChanged();
+  private Item[] mItems = new Item[5];
+  private ItemGroup mItemGroup = new ItemGroup();
+
+  @Before
+  public void setUp() throws Exception {
+    for (int i = 0; i < 5; i++) {
+      Item item = new Item();
+      item.setTitle("TestTitle" + i);
+      item.setId(i);
+      item.setLayoutResource(((i % 3) + 1) * 10);
+      mItems[i] = item;
+      mItemGroup.addChild(item);
     }
+  }
+
+  @Test
+  public void testAdapter() {
+    ItemAdapter adapter = new ItemAdapter(mItemGroup);
+    assertEquals("Adapter should have 5 items", 5, adapter.getCount());
+    assertEquals("Adapter should return the first item", mItems[0], adapter.getItem(0));
+    assertEquals("ID should be same as position", 2, adapter.getItemId(2));
+
+    // Each test item has its own layout resource, and therefore its own view type
+    assertEquals("Should have 3 different view types", 3, adapter.getViewTypeCount());
+    HashSet<Integer> viewTypes = new HashSet<>(3);
+    viewTypes.add(adapter.getItemViewType(0));
+    viewTypes.add(adapter.getItemViewType(1));
+    viewTypes.add(adapter.getItemViewType(2));
+
+    assertEquals("View types should be 0, 1, 2", new HashSet<>(Arrays.asList(0, 1, 2)), viewTypes);
+  }
+
+  @Test
+  public void testGetRootItemHierarchy() {
+    ItemAdapter adapter = new ItemAdapter(mItemGroup);
+    ItemHierarchy root = adapter.getRootItemHierarchy();
+    assertSame("Root item hierarchy should be mItemGroup", mItemGroup, root);
+  }
+
+  @Test
+  public void testAdapterNotifications() {
+    ItemAdapter adapter = new ItemAdapter(mItemGroup);
+    final DataSetObserver observer = mock(DataSetObserver.class);
+    adapter.registerDataSetObserver(observer);
+    final InOrder inOrder = inOrder(observer);
+
+    mItems[0].setTitle("Child 1");
+    inOrder.verify(observer).onChanged();
+
+    mItemGroup.removeChild(mItems[1]);
+    inOrder.verify(observer).onChanged();
+
+    mItemGroup.addChild(mItems[1]);
+    inOrder.verify(observer).onChanged();
+  }
 }