Sms module migration

JoaquimLey · Apr 12, 2018 · 321e0f5 · 321e0f5
1 parent 1ed090b
commit 321e0f5
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 39 deletions.
diff --git a/...e-ui/src/test/java/com/joaquimley/transporteta/ui/home/favorite/FavoritesViewModelTest.kt b/...e-ui/src/test/java/com/joaquimley/transporteta/ui/home/favorite/FavoritesViewModelTest.kt
@@ -6,7 +6,7 @@ import com.joaquimley.transporteta.ui.model.FavoriteView
 import com.joaquimley.transporteta.ui.model.data.Resource
 import com.joaquimley.transporteta.ui.model.data.ResourceState
 import com.joaquimley.transporteta.sms.SmsController
-import com.joaquimley.transporteta.ui.sms.model.SmsModel
+import com.joaquimley.transporteta.sms.model.SmsModel
 import com.nhaarman.mockito_kotlin.KArgumentCaptor
 import com.nhaarman.mockito_kotlin.times
 import com.nhaarman.mockito_kotlin.verify

diff --git a/transport-eta-android/sms/build.gradle b/transport-eta-android/sms/build.gradle
@@ -18,16 +18,16 @@ android {
         exclude 'META-INF/LICENSE'
     }
 
-//    lintOptions {
-//        quiet true
-//        abortOnError false
-//        ignoreWarnings true
-//        disable 'InvalidPackage'            //Some libraries have issues with this.
-//        disable 'OldTargetApi'
-//        // Lint gives this warning but SDK 20 would be Android L Beta.
-//        disable 'IconDensities'             //For testing purpose. This is safe to remove.
-//        disable 'IconMissingDensityFolder'  //For testing purpose. This is safe to remove.
-//    }
+    lintOptions {
+        quiet true
+        abortOnError false
+        ignoreWarnings true
+        disable 'InvalidPackage'            //Some libraries have issues with this.
+        disable 'OldTargetApi'
+        // Lint gives this warning but SDK 20 would be Android L Beta.
+        disable 'IconDensities'             //For testing purpose. This is safe to remove.
+        disable 'IconMissingDensityFolder'  //For testing purpose. This is safe to remove.
+    }
 
 }
 
@@ -52,4 +52,27 @@ dependencies {
     testImplementation deps.assertj
     testImplementation deps.robolectric
     testImplementation deps.arch_core.testing
+    // Instrumentation testing
+    androidTestImplementation deps.kotlin.mockito
+    androidTestImplementation(deps.atsl.runner) {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    androidTestImplementation(deps.atsl.rules) {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    androidTestImplementation(deps.espresso.core) {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    androidTestImplementation(deps.espresso.intents) {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    androidTestImplementation(deps.espresso.contrib) {
+        exclude module: 'appcompat'
+        exclude module: 'appcompat-v7'
+        exclude module: 'support-v4'
+        exclude module: 'support-v13'
+        exclude module: 'support-annotations'
+        exclude module: 'recyclerview-v7'
+        exclude module: 'design'
+    }
 }
diff --git a/...android/sms/src/androidTest/java/com/joaquimley/transporteta/ExampleInstrumentedTest.java b/...android/sms/src/androidTest/java/com/joaquimley/transporteta/ExampleInstrumentedTest.java
diff --git a/.../transporteta/ui/sms/SmsControllerTest.kt → ...quimley/transporteta/SmsControllerTest.kt b/.../transporteta/ui/sms/SmsControllerTest.kt → ...quimley/transporteta/SmsControllerTest.kt
@@ -1,4 +1,4 @@
-package com.joaquimley.transporteta.ui.sms
+package com.joaquimley.transporteta
 
 import android.support.test.InstrumentationRegistry
 import android.support.test.runner.AndroidJUnit4
@@ -20,6 +20,6 @@ class SmsControllerTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getTargetContext()
-        assertEquals("com.joaquimley.transporteta", appContext.packageName)
+        assertEquals("com.joaquimley.transporteta.sms.test", appContext.packageName)
     }
 }