clearly rename test projects

This commit is contained in:
Nikita Skvortsov
2014-03-23 14:06:06 +04:00
committed by Natalia Ukhorskaya
parent 0ee97faca1
commit d2de398d3e
55 changed files with 9 additions and 9 deletions
@@ -8,11 +8,11 @@ Ignore("Requires Android SDK")
class KotlinAndroidGradleIT: BaseGradleIT() { class KotlinAndroidGradleIT: BaseGradleIT() {
Test fun testSimpleCompile() { Test fun testSimpleCompile() {
val project = Project("AndroidAlfaProject", "1.6") val project = Project("AndroidProject", "1.6")
project.build("build") { project.build("build") {
assertSuccessful() assertSuccessful()
assertContains(":LibAlfa:compileReleaseKotlin", assertContains(":Lib:compileReleaseKotlin",
":compileFlavor1DebugKotlin", ":compileFlavor1DebugKotlin",
":compileFlavor2DebugKotlin", ":compileFlavor2DebugKotlin",
":compileFlavor1JnidebugKotlin", ":compileFlavor1JnidebugKotlin",
@@ -30,14 +30,14 @@ class KotlinAndroidGradleIT: BaseGradleIT() {
// Run the build second time, assert everything is up-to-date // Run the build second time, assert everything is up-to-date
project.build("build") { project.build("build") {
assertSuccessful() assertSuccessful()
assertContains(":LibAlfa:compileReleaseKotlin UP-TO-DATE", ":LibAlfa:compileRelease UP-TO-DATE") assertContains(":Lib:compileReleaseKotlin UP-TO-DATE", ":Lib:compileRelease UP-TO-DATE")
} }
// Run the build third time, re-run tasks // Run the build third time, re-run tasks
project.build("build", "--rerun-tasks") { project.build("build", "--rerun-tasks") {
assertSuccessful() assertSuccessful()
assertContains(":LibAlfa:compileReleaseKotlin", assertContains(":Lib:compileReleaseKotlin",
":compileFlavor1DebugKotlin", ":compileFlavor1DebugKotlin",
":compileFlavor2DebugKotlin", ":compileFlavor2DebugKotlin",
":compileFlavor1JnidebugKotlin", ":compileFlavor1JnidebugKotlin",
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.gradle.BaseGradleIT.Project
class BasicKotlinGradleIT: BaseGradleIT() { class BasicKotlinGradleIT: BaseGradleIT() {
Test fun testCrossCompile() { Test fun testCrossCompile() {
val project = Project("alfa") val project = Project("kotlinJavaProject")
project.build("compileDeployKotlin", "build") { project.build("compileDeployKotlin", "build") {
assertSuccessful() assertSuccessful()
@@ -31,7 +31,7 @@ class BasicKotlinGradleIT: BaseGradleIT() {
} }
Test fun testKotlinOnlyCompile() { Test fun testKotlinOnlyCompile() {
val project = Project("beta") val project = Project("kotlinProject")
project.build("build") { project.build("build") {
assertSuccessful() assertSuccessful()
@@ -1 +0,0 @@
include ':AndroidAlfa', ':LibAlfa'
@@ -14,7 +14,7 @@ apply plugin: 'android'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
dependencies { dependencies {
compile project(':LibAlfa') compile project(':Lib')
} }
android { android {
@@ -7,4 +7,4 @@
# Location of the SDK. This is only used by Gradle. # Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the # For customization when using a Version Control System, please read the
# header note. # header note.
sdk.dir=C:/Program Files (x86)/Android/android-studio/sdk sdk.dir=C:/Program Files (x86)/Android/android-studio-0.5.1/sdk
@@ -0,0 +1 @@
include ':Android', ':Lib'