Multiple refactorizations

saulmm · Jan 5, 2016 · 73fe634 · 73fe634
1 parent ab8352e
commit 73fe634
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 29 deletions.
diff --git a/...mm/avengers/tests/MockRestDataSource.java → ...a/saulmm/avengers/MockRestDataSource.java b/...mm/avengers/tests/MockRestDataSource.java → ...a/saulmm/avengers/MockRestDataSource.java
@@ -1,4 +1,4 @@
-package saulmm.avengers.tests;
+package saulmm.avengers;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -7,6 +7,7 @@
 import java.util.List;
 
 import rx.Observable;
+import saulmm.avengers.TestData;
 import saulmm.avengers.entities.CollectionItem;
 import saulmm.avengers.entities.MarvelCharacter;
 import saulmm.avengers.repository.CharacterRepository;

diff --git a/...engers/tests/TestAvengersApplication.java → ...lmm/avengers/TestAvengersApplication.java b/...engers/tests/TestAvengersApplication.java → ...lmm/avengers/TestAvengersApplication.java
@@ -3,10 +3,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package saulmm.avengers.tests;
+package saulmm.avengers;
 
-import saulmm.avengers.AvengersApplication;
-import saulmm.avengers.injector.components.AppComponent;
+import saulmm.avengers.injector.DaggerTestAppComponent;
+import saulmm.avengers.injector.TestAppComponent;
+import saulmm.avengers.injector.TestAppModule;
 
 public class TestAvengersApplication extends AvengersApplication {
     private TestAppComponent mAppComponent;

diff --git a/app/src/androidTest/java/saulmm/avengers/TestData.java b/app/src/androidTest/java/saulmm/avengers/TestData.java
diff --git a/...ulmm/avengers/tests/TestAppComponent.java → ...m/avengers/injector/TestAppComponent.java b/...ulmm/avengers/tests/TestAppComponent.java → ...m/avengers/injector/TestAppComponent.java
@@ -3,15 +3,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package saulmm.avengers.tests;
+package saulmm.avengers.injector;
 
 import javax.inject.Singleton;
 
 import dagger.Component;
-import saulmm.avengers.AvengersApplication;
-import saulmm.avengers.injector.AppModule;
 import saulmm.avengers.injector.components.AppComponent;
 import saulmm.avengers.repository.CharacterRepository;
+import saulmm.avengers.TestAvengersApplication;
 
 @Singleton @Component(modules = TestAppModule.class)
 public interface TestAppComponent  extends AppComponent {

diff --git a/.../saulmm/avengers/tests/TestAppModule.java → ...ulmm/avengers/injector/TestAppModule.java b/.../saulmm/avengers/tests/TestAppModule.java → ...ulmm/avengers/injector/TestAppModule.java
@@ -3,15 +3,15 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package saulmm.avengers.tests;
+package saulmm.avengers.injector;
 
 import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
-import saulmm.avengers.AvengersApplication;
 import saulmm.avengers.repository.CharacterRepository;
-import saulmm.avengers.rest.RestDataSource;
+import saulmm.avengers.MockRestDataSource;
+import saulmm.avengers.TestAvengersApplication;
 
 @Module
 public class TestAppModule {

diff --git a/app/src/androidTest/java/saulmm/avengers/runner/AvengerTestRunner.java b/app/src/androidTest/java/saulmm/avengers/runner/AvengerTestRunner.java
@@ -2,13 +2,9 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.test.internal.util.AndroidRunnerParams;
-import android.support.test.runner.AndroidJUnit4;
 import android.support.test.runner.AndroidJUnitRunner;
 
-import org.junit.runners.model.InitializationError;
-
-import saulmm.avengers.tests.TestAvengersApplication;
+import saulmm.avengers.TestAvengersApplication;
 
 /**
  * Created by saulmm on 04/01/16.

diff --git a/app/src/androidTest/java/saulmm/avengers/tests/CharacterListActivityInstrumentationTest.java b/app/src/androidTest/java/saulmm/avengers/tests/CharacterListActivityInstrumentationTest.java
@@ -8,6 +8,7 @@
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.test.suitebuilder.annotation.LargeTest;
+import android.widget.TextView;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -26,10 +27,15 @@
 
 import static android.support.test.espresso.Espresso.*;
 import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static android.support.test.espresso.intent.Intents.intended;
 import static android.support.test.espresso.intent.Intents.times;
 import static android.support.test.espresso.intent.matcher.IntentMatchers.hasComponent;
+import static android.support.test.espresso.matcher.ViewMatchers.*;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
 
 @LargeTest
 @RunWith(AndroidJUnit4.class)
@@ -40,8 +46,13 @@ public class CharacterListActivityInstrumentationTest {
             new IntentsTestRule<>(CharacterListActivity.class);
 
     @Test
-    public void testThatAClickOnTheAvengerOPensTheDetailActivity() {
-        onView(ViewMatchers.withId(R.id.activity_avengers_recycler))
+    public void testThatAvengersDataIsShown() {
+        onView(withText("Arcana")).check(matches(isDisplayed()));
+    }
+
+    @Test
+    public void testThatAClickOnTheAvengerOpensTheDetailActivity() {
+        onView(withId(R.id.activity_avengers_recycler))
             .perform(RecyclerViewActions.actionOnItemAtPosition(0, click()));
 
         intended(hasComponent(CharacterDetailActivity.class.getCanonicalName()));

diff --git a/app/src/androidTest/java/saulmm/avengers/tests/TestData.java b/app/src/androidTest/java/saulmm/avengers/tests/TestData.java