Minor tests refactoring

Author: dmitriy

android/TPSDropDown/.travis.yml

@@ -13,7 +13,6 @@ android:
     - extra-android-m2repository
 
 before_script:
-  # Create and start emulator
   - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
   - emulator -avd test -no-skin -no-audio -no-window &
   - android-wait-for-emulator

android/TPSDropDown/testmodule/src/androidTest/java/com/gettipsi/testmodule/DropdownTests.java

@@ -57,9 +57,7 @@ public void checkForCorrectViews() {
 
     @Test
     public void checkItemsSelection() {
-        onView(withId(R.id.dropdownId))
-                .perform(new SetupElementsAction(items))
-                .check(ViewAssertions.matches(DropdownMatcher.withListSize(items.size())));
+        setupItems();
 
         onView(withId(R.id.dropdownId))
                 .perform(new SetSelectedAction(0))
@@ -85,10 +83,7 @@ public void checkItemsSelection() {
 
     @Test
     public void checkItemsWithNameSelection() {
-        onView(withId(R.id.dropdownId))
-                .perform(new SetupElementsAction(items))
-                .check(ViewAssertions.matches(DropdownMatcher.withListSize(items.size())));
-
+        setupItems();
         onView(withId(R.id.dropdownId))
                 .perform(new SelectElementWithNameAction(items.get(0).toString()))
                 .check(matches(withSpinnerText(items.get(0).toString())));
@@ -113,6 +108,7 @@ public void checkItemsWithNameSelection() {
 
     @Test
     public void checkItemsClickSelection() {
+        setupItems();
         String item = items.get(0).toString();
         onView(withId(R.id.dropdownId)).perform(click());
         onData(allOf(is(instanceOf(String.class)), is(item))).perform(click());
@@ -134,4 +130,10 @@ public void checkItemsClickSelection() {
         onView(withId(R.id.dropdownId)).check(matches(withSpinnerText(containsString(item3))));
     }
 
+    private void setupItems() {
+        onView(withId(R.id.dropdownId))
+                .perform(new SetupElementsAction(items))
+                .check(ViewAssertions.matches(DropdownMatcher.withListSize(items.size())));
+    }
+
 }

android/TPSDropDown/testmodule/src/main/java/com/gettipsi/testmodule/MainActivity.java

@@ -1,22 +1,13 @@
 package com.gettipsi.testmodule;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-
-import com.gettipsi.tpsdropdown.Dropdown;
-import com.gettipsi.tpsdropdown.DropdownContainer;
-
-import java.util.Arrays;
+import android.support.v7.app.AppCompatActivity;
 
 public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
-        Dropdown dropdown = ((DropdownContainer) findViewById(R.id.dropdown)).getDropdown();
-        dropdown.setupWithElements(Arrays.<Object>asList("One", "Two", "Three", "Four"));
-
     }
 }