diff --git a/epoxy-modelfactory/build.gradle b/epoxy-modelfactory/build.gradle index 1291453da2..11adf6cd7c 100644 --- a/epoxy-modelfactory/build.gradle +++ b/epoxy-modelfactory/build.gradle @@ -1,8 +1,4 @@ -import org.gradle.internal.jvm.Jvm - apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' apply plugin: "com.vanniktech.maven.publish" android { @@ -13,63 +9,11 @@ android { minSdkVersion 16 targetSdkVersion rootProject.TARGET_SDK_VERSION } - - testOptions.unitTests.includeAndroidResources = true -} - -configurations.all { strategy -> - strategy.resolutionStrategy.force rootProject.deps.junit, rootProject.deps.robolectric, - rootProject.deps.mockito -} - -// Java files in the "resources" folder are not included in the build for some reason (seems like source files are skipped?) -// This files are needed to test the annotation processor, so we manually copy them into the build. -task('copyDebugTestResources', type: Copy) { - from("${projectDir}/src/test/resources") - into("${buildDir}/intermediates/sourceFolderJavaResources/debug") -} - -task('copyReleaseTestResources', type: Copy) { - from("${projectDir}/src/test/resources") - into("${buildDir}/intermediates/sourceFolderJavaResources/release") } -preBuild.dependsOn copyReleaseTestResources -preBuild.dependsOn copyDebugTestResources - dependencies { implementation project(':epoxy-adapter') implementation rootProject.deps.paris - implementation rootProject.deps.kotlin implementation rootProject.deps.androidRecyclerView - - kapt project(':epoxy-processor') - - // Need to include the processors directly since we create an instance of it in code for testing - testImplementation project(':epoxy-processor') - testImplementation rootProject.deps.parisProcessor - - testImplementation project(':epoxy-processortest') - testImplementation rootProject.deps.googleTestingCompile - testImplementation rootProject.deps.junit - testImplementation rootProject.deps.robolectric - testImplementation files(getRuntimeJar()) - testImplementation files(Jvm.current().getToolsJar()) } -// Javadoc isn't working well with Kotlin :( -tasks.withType(Javadoc).all { enabled = false } - -static def getRuntimeJar() { - try { - final File javaBase = new File(System.getProperty("java.home")).getCanonicalFile() - File runtimeJar = new File(javaBase, "lib/rt.jar") - if (runtimeJar.exists()) { - return runtimeJar - } - runtimeJar = new File(javaBase, "jre/lib/rt.jar") - return runtimeJar.exists() ? runtimeJar : null - } catch (IOException e) { - throw new RuntimeException(e) - } -} diff --git a/epoxy-modelfactorytest/.gitignore b/epoxy-modelfactorytest/.gitignore new file mode 100644 index 0000000000..796b96d1c4 --- /dev/null +++ b/epoxy-modelfactorytest/.gitignore @@ -0,0 +1 @@ +/build diff --git a/epoxy-modelfactorytest/build.gradle b/epoxy-modelfactorytest/build.gradle new file mode 100644 index 0000000000..1d78fda222 --- /dev/null +++ b/epoxy-modelfactorytest/build.gradle @@ -0,0 +1,72 @@ +import org.gradle.internal.jvm.Jvm + +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' + +android { + compileSdkVersion rootProject.COMPILE_SDK_VERSION + + defaultConfig { + // Using 16 here as it is the minimum version of Paris, which we are restricted to. + minSdkVersion 16 + targetSdkVersion rootProject.TARGET_SDK_VERSION + } + + testOptions.unitTests.includeAndroidResources = true +} + +configurations.all { strategy -> + strategy.resolutionStrategy.force rootProject.deps.junit, rootProject.deps.robolectric, + rootProject.deps.mockito +} + +// Java files in the "resources" folder are not included in the build for some reason (seems like source files are skipped?) +// This files are needed to test the annotation processor, so we manually copy them into the build. +task('copyDebugTestResources', type: Copy) { + from("${projectDir}/src/test/resources") + into("${buildDir}/intermediates/sourceFolderJavaResources/debug") +} + +task('copyReleaseTestResources', type: Copy) { + from("${projectDir}/src/test/resources") + into("${buildDir}/intermediates/sourceFolderJavaResources/release") +} + +preBuild.dependsOn copyReleaseTestResources +preBuild.dependsOn copyDebugTestResources + +dependencies { + implementation project(':epoxy-adapter') + implementation project(':epoxy-modelfactory') + implementation rootProject.deps.paris + implementation rootProject.deps.kotlin + implementation rootProject.deps.androidRecyclerView + + kapt project(':epoxy-processor') + + // Need to include the processors directly since we create an instance of it in code for testing + testImplementation project(':epoxy-processor') + testImplementation rootProject.deps.parisProcessor + + testImplementation project(':epoxy-processortest') + testImplementation rootProject.deps.googleTestingCompile + testImplementation rootProject.deps.junit + testImplementation rootProject.deps.robolectric + testImplementation files(getRuntimeJar()) + testImplementation files(Jvm.current().getToolsJar()) +} + +static def getRuntimeJar() { + try { + final File javaBase = new File(System.getProperty("java.home")).getCanonicalFile() + File runtimeJar = new File(javaBase, "lib/rt.jar") + if (runtimeJar.exists()) { + return runtimeJar + } + runtimeJar = new File(javaBase, "jre/lib/rt.jar") + return runtimeJar.exists() ? runtimeJar : null + } catch (IOException e) { + throw new RuntimeException(e) + } +} diff --git a/epoxy-modelfactorytest/src/main/AndroidManifest.xml b/epoxy-modelfactorytest/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..4a3ba33adb --- /dev/null +++ b/epoxy-modelfactorytest/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + diff --git a/epoxy-modelfactory/src/main/java/com/airbnb/epoxy/TestModelPropertiesKotlinView.kt b/epoxy-modelfactorytest/src/main/java/com/airbnb/epoxy/TestModelPropertiesKotlinView.kt similarity index 100% rename from epoxy-modelfactory/src/main/java/com/airbnb/epoxy/TestModelPropertiesKotlinView.kt rename to epoxy-modelfactorytest/src/main/java/com/airbnb/epoxy/TestModelPropertiesKotlinView.kt diff --git a/epoxy-modelfactory/src/main/java/com/airbnb/epoxy/TestModelPropertiesView.java b/epoxy-modelfactorytest/src/main/java/com/airbnb/epoxy/TestModelPropertiesView.java similarity index 100% rename from epoxy-modelfactory/src/main/java/com/airbnb/epoxy/TestModelPropertiesView.java rename to epoxy-modelfactorytest/src/main/java/com/airbnb/epoxy/TestModelPropertiesView.java diff --git a/epoxy-modelfactorytest/src/main/res/values/strings.xml b/epoxy-modelfactorytest/src/main/res/values/strings.xml new file mode 100644 index 0000000000..70ff5e67c0 --- /dev/null +++ b/epoxy-modelfactorytest/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Epoxy Model Factory Test + diff --git a/epoxy-modelfactory/src/test/java/com/airbnb/epoxy/FromModelPropertiesKotlinTest.kt b/epoxy-modelfactorytest/src/test/java/com/airbnb/epoxy/FromModelPropertiesKotlinTest.kt similarity index 76% rename from epoxy-modelfactory/src/test/java/com/airbnb/epoxy/FromModelPropertiesKotlinTest.kt rename to epoxy-modelfactorytest/src/test/java/com/airbnb/epoxy/FromModelPropertiesKotlinTest.kt index a5b141c8d2..c83fc5eec9 100644 --- a/epoxy-modelfactory/src/test/java/com/airbnb/epoxy/FromModelPropertiesKotlinTest.kt +++ b/epoxy-modelfactorytest/src/test/java/com/airbnb/epoxy/FromModelPropertiesKotlinTest.kt @@ -15,21 +15,33 @@ class FromModelPropertiesKotlinTest { @Test fun getId() { - val model = TestModelPropertiesKotlinViewModel_.from(TestModelProperties(id = "100")) + val model = TestModelPropertiesKotlinViewModel_.from( + TestModelProperties( + id = "100" + ) + ) assertFalse(model.hasDefaultId()) } @Test fun getBoolean() { val model = - TestModelPropertiesKotlinViewModel_.from(TestModelProperties(booleanValue = true)) + TestModelPropertiesKotlinViewModel_.from( + TestModelProperties( + booleanValue = true + ) + ) assertEquals(true, model.booleanValue()) } @Test fun getDouble() { val model = - TestModelPropertiesKotlinViewModel_.from(TestModelProperties(doubleValue = 42.0)) + TestModelPropertiesKotlinViewModel_.from( + TestModelProperties( + doubleValue = 42.0 + ) + ) assertEquals(42.0, model.doubleValue(), 0.0) } @@ -59,14 +71,22 @@ class FromModelPropertiesKotlinTest { @Test fun getInt() { - val model = TestModelPropertiesKotlinViewModel_.from(TestModelProperties(intValue = 51)) + val model = TestModelPropertiesKotlinViewModel_.from( + TestModelProperties( + intValue = 51 + ) + ) assertEquals(51, model.intValue()) } @Test fun getLong() { val model = - TestModelPropertiesKotlinViewModel_.from(TestModelProperties(longValue = 3000000L)) + TestModelPropertiesKotlinViewModel_.from( + TestModelProperties( + longValue = 3000000L + ) + ) assertEquals(3000000L, model.longValue()) } @@ -84,7 +104,11 @@ class FromModelPropertiesKotlinTest { @Test fun getNullOnClickListener() { val model = - TestModelPropertiesKotlinViewModel_.from(TestModelProperties(onClickListener = null)) + TestModelPropertiesKotlinViewModel_.from( + TestModelProperties( + onClickListener = null + ) + ) assertNull(model.onClickListener()) } @@ -92,7 +116,11 @@ class FromModelPropertiesKotlinTest { fun getRawRes() { // We use an arbitrary int rather than adding a test-only raw resource, which isn't easy val model = - TestModelPropertiesKotlinViewModel_.from(TestModelProperties(rawRes = 42)) + TestModelPropertiesKotlinViewModel_.from( + TestModelProperties( + rawRes = 42 + ) + ) assertEquals(42, model.rawRes()) } @@ -100,7 +128,9 @@ class FromModelPropertiesKotlinTest { fun getString() { val model = TestModelPropertiesKotlinViewModel_.from( - TestModelProperties(stringValue = "ModelFactory") + TestModelProperties( + stringValue = "ModelFactory" + ) ) assertEquals("ModelFactory", model.stringValue()) } @@ -109,7 +139,11 @@ class FromModelPropertiesKotlinTest { fun getStringList() { val stringList = listOf("Model", "Factory") val model = - TestModelPropertiesKotlinViewModel_.from(TestModelProperties(stringList = stringList)) + TestModelPropertiesKotlinViewModel_.from( + TestModelProperties( + stringList = stringList + ) + ) assertEquals(stringList, model.stringList()) } diff --git a/epoxy-modelfactory/src/test/java/com/airbnb/epoxy/FromModelPropertiesTest.kt b/epoxy-modelfactorytest/src/test/java/com/airbnb/epoxy/FromModelPropertiesTest.kt similarity index 67% rename from epoxy-modelfactory/src/test/java/com/airbnb/epoxy/FromModelPropertiesTest.kt rename to epoxy-modelfactorytest/src/test/java/com/airbnb/epoxy/FromModelPropertiesTest.kt index a23a6e785b..d01cf989b6 100644 --- a/epoxy-modelfactory/src/test/java/com/airbnb/epoxy/FromModelPropertiesTest.kt +++ b/epoxy-modelfactorytest/src/test/java/com/airbnb/epoxy/FromModelPropertiesTest.kt @@ -15,32 +15,52 @@ class FromModelPropertiesTest { @Test fun getId() { - val model = TestModelPropertiesViewModel_.from(TestModelProperties(id = "100")) + val model = TestModelPropertiesViewModel_.from( + TestModelProperties( + id = "100" + ) + ) assertFalse(model.hasDefaultId()) } @Test fun getBoolean() { - val model = TestModelPropertiesViewModel_.from(TestModelProperties(booleanValue = true)) + val model = TestModelPropertiesViewModel_.from( + TestModelProperties( + booleanValue = true + ) + ) assertEquals(true, model.booleanValue()) } @Test fun getBoxedBoolean() { val model = - TestModelPropertiesViewModel_.from(TestModelProperties(boxedBooleanValue = true)) + TestModelPropertiesViewModel_.from( + TestModelProperties( + boxedBooleanValue = true + ) + ) assertEquals(true, model.boxedBooleanValue()) } @Test fun getDouble() { - val model = TestModelPropertiesViewModel_.from(TestModelProperties(doubleValue = 42.0)) + val model = TestModelPropertiesViewModel_.from( + TestModelProperties( + doubleValue = 42.0 + ) + ) assertEquals(42.0, model.doubleValue(), 0.0) } @Test fun getBoxedDouble() { - val model = TestModelPropertiesViewModel_.from(TestModelProperties(boxedDoubleValue = 42.0)) + val model = TestModelPropertiesViewModel_.from( + TestModelProperties( + boxedDoubleValue = 42.0 + ) + ) assertEquals(42.0, model.boxedDoubleValue(), 0.0) } @@ -48,7 +68,11 @@ class FromModelPropertiesTest { fun getDrawableRes() { val drawableRes = R.drawable.abc_ic_star_black_48dp val model = - TestModelPropertiesViewModel_.from(TestModelProperties(drawableRes = drawableRes)) + TestModelPropertiesViewModel_.from( + TestModelProperties( + drawableRes = drawableRes + ) + ) assertEquals(drawableRes, model.drawableRes()) } @@ -56,32 +80,52 @@ class FromModelPropertiesTest { fun getEpoxyModelList() { val epoxyModelList = emptyList>() val model = - TestModelPropertiesViewModel_.from(TestModelProperties(epoxyModelList = epoxyModelList)) + TestModelPropertiesViewModel_.from( + TestModelProperties( + epoxyModelList = epoxyModelList + ) + ) assertEquals(epoxyModelList, model.epoxyModelList()) } @Test fun getInt() { - val model = TestModelPropertiesViewModel_.from(TestModelProperties(intValue = 51)) + val model = TestModelPropertiesViewModel_.from( + TestModelProperties( + intValue = 51 + ) + ) assertEquals(51, model.intValue()) } @Test fun getBoxedInt() { - val model = TestModelPropertiesViewModel_.from(TestModelProperties(boxedIntValue = 51)) + val model = TestModelPropertiesViewModel_.from( + TestModelProperties( + boxedIntValue = 51 + ) + ) assertEquals(51, model.boxedIntValue()) } @Test fun getLong() { - val model = TestModelPropertiesViewModel_.from(TestModelProperties(longValue = 3000000)) + val model = TestModelPropertiesViewModel_.from( + TestModelProperties( + longValue = 3000000 + ) + ) assertEquals(3000000, model.longValue()) } @Test fun getBoxedLong() { val model = - TestModelPropertiesViewModel_.from(TestModelProperties(boxedLongValue = 3000000)) + TestModelPropertiesViewModel_.from( + TestModelProperties( + boxedLongValue = 3000000 + ) + ) assertEquals(3000000, model.boxedLongValue()) } @@ -89,13 +133,21 @@ class FromModelPropertiesTest { fun getOnClickListener() { val clickListener = View.OnClickListener { } val model = - TestModelPropertiesViewModel_.from(TestModelProperties(onClickListener = clickListener)) + TestModelPropertiesViewModel_.from( + TestModelProperties( + onClickListener = clickListener + ) + ) assertEquals(clickListener, model.onClickListener()) } @Test fun getNullOnClickListener() { - val model = TestModelPropertiesViewModel_.from(TestModelProperties(onClickListener = null)) + val model = TestModelPropertiesViewModel_.from( + TestModelProperties( + onClickListener = null + ) + ) assertNull(model.onClickListener()) } @@ -103,21 +155,33 @@ class FromModelPropertiesTest { fun getRawRes() { // We use an arbitrary int rather than adding a test-only raw resource, which isn't easy val model = - TestModelPropertiesViewModel_.from(TestModelProperties(rawRes = 42)) + TestModelPropertiesViewModel_.from( + TestModelProperties( + rawRes = 42 + ) + ) assertEquals(42, model.rawRes()) } @Test fun getString() { val model = - TestModelPropertiesViewModel_.from(TestModelProperties(stringValue = "ModelFactory")) + TestModelPropertiesViewModel_.from( + TestModelProperties( + stringValue = "ModelFactory" + ) + ) assertEquals("ModelFactory", model.stringValue()) } @Test fun getStringList() { val stringList = listOf("Model", "Factory") - val model = TestModelPropertiesViewModel_.from(TestModelProperties(stringList = stringList)) + val model = TestModelPropertiesViewModel_.from( + TestModelProperties( + stringList = stringList + ) + ) assertEquals(stringList, model.stringList()) } diff --git a/epoxy-modelfactory/src/test/java/com/airbnb/epoxy/ModelFactoryViewProcessorTest.kt b/epoxy-modelfactorytest/src/test/java/com/airbnb/epoxy/ModelFactoryViewProcessorTest.kt similarity index 100% rename from epoxy-modelfactory/src/test/java/com/airbnb/epoxy/ModelFactoryViewProcessorTest.kt rename to epoxy-modelfactorytest/src/test/java/com/airbnb/epoxy/ModelFactoryViewProcessorTest.kt diff --git a/epoxy-modelfactory/src/test/java/com/airbnb/epoxy/ProcessorTestUtils.kt b/epoxy-modelfactorytest/src/test/java/com/airbnb/epoxy/ProcessorTestUtils.kt similarity index 100% rename from epoxy-modelfactory/src/test/java/com/airbnb/epoxy/ProcessorTestUtils.kt rename to epoxy-modelfactorytest/src/test/java/com/airbnb/epoxy/ProcessorTestUtils.kt diff --git a/epoxy-modelfactory/src/test/java/com/airbnb/epoxy/package-info.java b/epoxy-modelfactorytest/src/test/java/com/airbnb/epoxy/package-info.java similarity index 100% rename from epoxy-modelfactory/src/test/java/com/airbnb/epoxy/package-info.java rename to epoxy-modelfactorytest/src/test/java/com/airbnb/epoxy/package-info.java diff --git a/epoxy-modelfactory/src/test/resources/AllTypesModelView.java b/epoxy-modelfactorytest/src/test/resources/AllTypesModelView.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/AllTypesModelView.java rename to epoxy-modelfactorytest/src/test/resources/AllTypesModelView.java diff --git a/epoxy-modelfactory/src/test/resources/AllTypesModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/AllTypesModelViewModel_.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/AllTypesModelViewModel_.java rename to epoxy-modelfactorytest/src/test/resources/AllTypesModelViewModel_.java diff --git a/epoxy-modelfactory/src/test/resources/BasicModelWithFinalAttribute.java b/epoxy-modelfactorytest/src/test/resources/BasicModelWithFinalAttribute.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/BasicModelWithFinalAttribute.java rename to epoxy-modelfactorytest/src/test/resources/BasicModelWithFinalAttribute.java diff --git a/epoxy-modelfactory/src/test/resources/BasicModelWithFinalAttribute_.java b/epoxy-modelfactorytest/src/test/resources/BasicModelWithFinalAttribute_.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/BasicModelWithFinalAttribute_.java rename to epoxy-modelfactorytest/src/test/resources/BasicModelWithFinalAttribute_.java diff --git a/epoxy-modelfactory/src/test/resources/CallbackPropModelView.java b/epoxy-modelfactorytest/src/test/resources/CallbackPropModelView.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/CallbackPropModelView.java rename to epoxy-modelfactorytest/src/test/resources/CallbackPropModelView.java diff --git a/epoxy-modelfactory/src/test/resources/CallbackPropModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/CallbackPropModelViewModel_.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/CallbackPropModelViewModel_.java rename to epoxy-modelfactorytest/src/test/resources/CallbackPropModelViewModel_.java diff --git a/epoxy-modelfactory/src/test/resources/GroupPropMultipleSupportedAttributeDifferentNameModelView.java b/epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeDifferentNameModelView.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/GroupPropMultipleSupportedAttributeDifferentNameModelView.java rename to epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeDifferentNameModelView.java diff --git a/epoxy-modelfactory/src/test/resources/GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_.java rename to epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_.java diff --git a/epoxy-modelfactory/src/test/resources/GroupPropMultipleSupportedAttributeSameNameModelView.java b/epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeSameNameModelView.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/GroupPropMultipleSupportedAttributeSameNameModelView.java rename to epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeSameNameModelView.java diff --git a/epoxy-modelfactory/src/test/resources/GroupPropMultipleSupportedAttributeSameNameModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeSameNameModelViewModel_.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/GroupPropMultipleSupportedAttributeSameNameModelViewModel_.java rename to epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeSameNameModelViewModel_.java diff --git a/epoxy-modelfactory/src/test/resources/GroupPropSingleSupportedAttributeModelView.java b/epoxy-modelfactorytest/src/test/resources/GroupPropSingleSupportedAttributeModelView.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/GroupPropSingleSupportedAttributeModelView.java rename to epoxy-modelfactorytest/src/test/resources/GroupPropSingleSupportedAttributeModelView.java diff --git a/epoxy-modelfactory/src/test/resources/GroupPropSingleSupportedAttributeModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/GroupPropSingleSupportedAttributeModelViewModel_.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/GroupPropSingleSupportedAttributeModelViewModel_.java rename to epoxy-modelfactorytest/src/test/resources/GroupPropSingleSupportedAttributeModelViewModel_.java diff --git a/epoxy-modelfactory/src/test/resources/ListSubtypeModelView.java b/epoxy-modelfactorytest/src/test/resources/ListSubtypeModelView.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/ListSubtypeModelView.java rename to epoxy-modelfactorytest/src/test/resources/ListSubtypeModelView.java diff --git a/epoxy-modelfactory/src/test/resources/ListSubtypeModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/ListSubtypeModelViewModel_.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/ListSubtypeModelViewModel_.java rename to epoxy-modelfactorytest/src/test/resources/ListSubtypeModelViewModel_.java diff --git a/epoxy-modelfactory/src/test/resources/ModelFactoryBaseModelView.java b/epoxy-modelfactorytest/src/test/resources/ModelFactoryBaseModelView.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/ModelFactoryBaseModelView.java rename to epoxy-modelfactorytest/src/test/resources/ModelFactoryBaseModelView.java diff --git a/epoxy-modelfactory/src/test/resources/ModelFactoryBaseModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/ModelFactoryBaseModelViewModel_.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/ModelFactoryBaseModelViewModel_.java rename to epoxy-modelfactorytest/src/test/resources/ModelFactoryBaseModelViewModel_.java diff --git a/epoxy-modelfactory/src/test/resources/ModelFactoryBasicModelWithAttribute.java b/epoxy-modelfactorytest/src/test/resources/ModelFactoryBasicModelWithAttribute.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/ModelFactoryBasicModelWithAttribute.java rename to epoxy-modelfactorytest/src/test/resources/ModelFactoryBasicModelWithAttribute.java diff --git a/epoxy-modelfactory/src/test/resources/ModelFactoryBasicModelWithAttribute_.java b/epoxy-modelfactorytest/src/test/resources/ModelFactoryBasicModelWithAttribute_.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/ModelFactoryBasicModelWithAttribute_.java rename to epoxy-modelfactorytest/src/test/resources/ModelFactoryBasicModelWithAttribute_.java diff --git a/epoxy-modelfactory/src/test/resources/StyleableModelView.java b/epoxy-modelfactorytest/src/test/resources/StyleableModelView.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/StyleableModelView.java rename to epoxy-modelfactorytest/src/test/resources/StyleableModelView.java diff --git a/epoxy-modelfactory/src/test/resources/StyleableModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/StyleableModelViewModel_.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/StyleableModelViewModel_.java rename to epoxy-modelfactorytest/src/test/resources/StyleableModelViewModel_.java diff --git a/epoxy-modelfactory/src/test/resources/TextPropModelView.java b/epoxy-modelfactorytest/src/test/resources/TextPropModelView.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/TextPropModelView.java rename to epoxy-modelfactorytest/src/test/resources/TextPropModelView.java diff --git a/epoxy-modelfactory/src/test/resources/TextPropModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/TextPropModelViewModel_.java similarity index 100% rename from epoxy-modelfactory/src/test/resources/TextPropModelViewModel_.java rename to epoxy-modelfactorytest/src/test/resources/TextPropModelViewModel_.java diff --git a/epoxy-modelfactory/src/test/resources/test.json b/epoxy-modelfactorytest/src/test/resources/test.json similarity index 100% rename from epoxy-modelfactory/src/test/resources/test.json rename to epoxy-modelfactorytest/src/test/resources/test.json diff --git a/settings.gradle b/settings.gradle index 0ff61dca1e..2d2fddbaa2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,5 +11,6 @@ include ':epoxy-paging' include ':epoxy-pagingsample' include ':kotlinsample' include ':epoxy-modelfactory' +include ':epoxy-modelfactorytest' include ':epoxy-glide-preloader' include ':epoxy-preloadersample'