* merge fixes

BelooS · Dec 23, 2016 · 9b271a8 · 9b271a8
1 parent 84dd1c4
commit 9b271a8
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 19 deletions.
diff --git a/.idea/runConfigurations/Instrumental_tests.xml b/.idea/runConfigurations/Instrumental_tests.xml
diff --git a/.idea/runConfigurations/Unit_tests.xml b/.idea/runConfigurations/Unit_tests.xml
diff --git a/.idea/runConfigurations/functional_tests.xml b/.idea/runConfigurations/functional_tests.xml
diff --git a/sample/src/androidTest/java/com/beloo/widget/chipslayoutmanager/ChipsLayoutManagerTest.java b/sample/src/androidTest/java/com/beloo/widget/chipslayoutmanager/ChipsLayoutManagerTest.java
@@ -10,10 +10,8 @@
 import android.support.test.runner.AndroidJUnit4;
 import android.support.v7.widget.RecyclerView;
 
-import com.beloo.chipslayoutmanager.sample.entity.ChipsEntity;
 import com.beloo.chipslayoutmanager.sample.ui.LayoutManagerFactory;
 import com.beloo.chipslayoutmanager.sample.ui.ChipsFacade;
-import com.beloo.chipslayoutmanager.sample.ui.OnRemoveListener;
 import com.beloo.chipslayoutmanager.sample.ui.TestActivity;
 import com.beloo.chipslayoutmanager.sample.ui.adapter.ChipsAdapter;
 import com.beloo.widget.chipslayoutmanager.util.InstrumentalUtil;
@@ -27,7 +25,7 @@
 import org.mockito.MockitoAnnotations;
 
 import com.beloo.chipslayoutmanager.sample.R;
-import com.beloo.widget.chipslayoutmanager.util.RecyclerViewActionsFactory;
+import com.beloo.widget.chipslayoutmanager.util.RecyclerViewActionFactory;
 
 import static android.support.test.espresso.Espresso.onView;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
@@ -36,24 +34,20 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyList;
-import static org.mockito.Matchers.anyListOf;
-import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
 
 /**
  * test for {@link TestActivity}
  */
 @RunWith(AndroidJUnit4.class)
 public class ChipsLayoutManagerTest {
 
-    private static RecyclerViewActionsFactory actionsFactory;
+    private static RecyclerViewActionFactory actionsFactory;
 
     static {
-        actionsFactory = new RecyclerViewActionsFactory();
+        actionsFactory = new RecyclerViewActionFactory();
         TestActivity.setItemsFactory(new ChipsFacade());
         TestActivity.isInitializeOutside = true;
     }

diff --git a/...ager/util/RecyclerVIewActionsFactory.java → ...nager/util/RecyclerViewActionFactory.java b/...ager/util/RecyclerVIewActionsFactory.java → ...nager/util/RecyclerViewActionFactory.java
@@ -17,7 +17,7 @@
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static org.hamcrest.Matchers.allOf;
 
-public class RecyclerViewActionsFactory {
+public class RecyclerViewActionFactory {
     public ViewAction scrollBy(int x, int y) {
         return new ScrollByRecyclerViewAction(x, y);
     }