Skip to content

Commit 07df920

Browse files
committedAug 9, 2017
Fix package structure for UI tests
1 parent ce7ea51 commit 07df920

File tree

11 files changed

+63
-132
lines changed

11 files changed

+63
-132
lines changed
 

‎domain/src/main/java/org/buffer/android/boilerplate/domain/SingleUseCase.java

-57
This file was deleted.

‎mobile-ui/build.gradle

+1-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ android {
1313
minSdkVersion globalConfiguration["androidMinSdkVersion"]
1414
targetSdkVersion globalConfiguration["androidTargetSdkVersion"]
1515
multiDexEnabled = true
16-
testInstrumentationRunner "org.buffer.android.boilerplate.ui.TestRunner"
16+
testInstrumentationRunner "org.buffer.android.boilerplate.ui.test.TestRunner"
1717
}
1818

1919
dexOptions {
@@ -39,10 +39,6 @@ android {
3939
quiet true
4040
abortOnError false
4141
ignoreWarnings true
42-
disable 'InvalidPackage' //Some libraries have issues with this.
43-
disable 'OldTargetApi' //Lint gives this warning but SDK 20 would be Android L Beta.
44-
disable 'IconDensities' //For testing purpose. This is safe to remove.
45-
disable 'IconMissingDensityFolder' //For testing purpose. This is safe to remove.
4642
}
4743

4844
}

‎mobile-ui/src/androidTest/java/org/buffer/android/boilerplate/ui/browse/BrowseActivityTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.nhaarman.mockito_kotlin.whenever
1111
import io.reactivex.Single
1212
import org.buffer.android.boilerplate.domain.model.Bufferoo
1313
import org.buffer.android.boilerplate.ui.R
14-
import org.buffer.android.boilerplate.ui.TestApplication
14+
import org.buffer.android.boilerplate.ui.test.TestApplication
1515
import org.buffer.android.boilerplate.ui.test.factory.ui.BufferooFactory
1616
import org.buffer.android.boilerplate.ui.test.util.RecyclerViewMatcher
1717
import org.junit.Rule

‎mobile-ui/src/androidTest/java/org/buffer/android/boilerplate/ui/injection/component/TestApplicationComponent.java

-37
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package org.buffer.android.boilerplate.ui.injection.component
2+
3+
import android.app.Application
4+
import dagger.BindsInstance
5+
import dagger.Component
6+
import dagger.android.support.AndroidSupportInjectionModule
7+
import org.buffer.android.boilerplate.domain.executor.PostExecutionThread
8+
import org.buffer.android.boilerplate.domain.repository.BufferooRepository
9+
import org.buffer.android.boilerplate.ui.injection.ApplicationComponent
10+
import org.buffer.android.boilerplate.ui.injection.module.ActivityBindingModule
11+
import org.buffer.android.boilerplate.ui.injection.module.TestApplicationModule
12+
import org.buffer.android.boilerplate.ui.injection.scopes.PerApplication
13+
import org.buffer.android.boilerplate.ui.test.TestApplication
14+
15+
@Component(modules = arrayOf(TestApplicationModule::class, ActivityBindingModule::class,
16+
AndroidSupportInjectionModule::class))
17+
@PerApplication
18+
interface TestApplicationComponent : ApplicationComponent {
19+
20+
fun bufferooRepository(): BufferooRepository
21+
22+
fun postExecutionThread(): PostExecutionThread
23+
24+
fun inject(application: TestApplication)
25+
26+
@Component.Builder
27+
interface Builder {
28+
@BindsInstance
29+
fun application(application: Application): TestApplicationComponent.Builder
30+
31+
fun build(): TestApplicationComponent
32+
}
33+
34+
}

‎mobile-ui/src/androidTest/java/org/buffer/android/boilerplate/ui/TestApplication.kt ‎mobile-ui/src/androidTest/java/org/buffer/android/boilerplate/ui/test/TestApplication.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.buffer.android.boilerplate.ui
1+
package org.buffer.android.boilerplate.ui.test
22

33
import android.app.Activity
44
import android.app.Application

‎mobile-ui/src/androidTest/java/org/buffer/android/boilerplate/ui/TestRunner.kt ‎mobile-ui/src/androidTest/java/org/buffer/android/boilerplate/ui/test/TestRunner.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.buffer.android.boilerplate.ui
1+
package org.buffer.android.boilerplate.ui.test
22

33
import android.app.Application
44
import android.content.Context

‎mobile-ui/src/main/java/org/buffer/android/boilerplate/ui/BufferooApplication.kt

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import org.buffer.android.boilerplate.ui.injection.DaggerApplicationComponent
1010
import timber.log.Timber
1111
import javax.inject.Inject
1212

13-
1413
class BufferooApplication : Application(), HasActivityInjector {
1514

1615
@Inject lateinit var activityDispatchingAndroidInjector: DispatchingAndroidInjector<Activity>

‎mobile-ui/src/main/java/org/buffer/android/boilerplate/ui/injection/ApplicationComponent.java

-29
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package org.buffer.android.boilerplate.ui.injection
2+
3+
import android.app.Application
4+
import dagger.BindsInstance
5+
import dagger.Component
6+
import dagger.android.support.AndroidSupportInjectionModule
7+
import org.buffer.android.boilerplate.ui.BufferooApplication
8+
import org.buffer.android.boilerplate.ui.injection.module.ActivityBindingModule
9+
import org.buffer.android.boilerplate.ui.injection.module.ApplicationModule
10+
import org.buffer.android.boilerplate.ui.injection.scopes.PerApplication
11+
12+
@PerApplication
13+
@Component(modules = arrayOf(ActivityBindingModule::class, ApplicationModule::class,
14+
AndroidSupportInjectionModule::class))
15+
interface ApplicationComponent {
16+
17+
@Component.Builder
18+
interface Builder {
19+
@BindsInstance fun application(application: Application): Builder
20+
fun build(): ApplicationComponent
21+
}
22+
23+
fun inject(app: BufferooApplication)
24+
25+
}

0 commit comments

Comments
 (0)
Please sign in to comment.