Skip to content

Commit

Permalink
Merge pull request #7 from AdamKobus/ST-176
Browse files Browse the repository at this point in the history
ST-176 Added ignoreFailures option to tests
  • Loading branch information
AdamKobus authored Sep 27, 2016
2 parents 297f6fc + 45d7e7f commit 7b643ef
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 1 deletion.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ buildscript {
}
}
dependencies {
classpath 'com.infullmobile:toolkit:0.3.14'
classpath 'com.infullmobile:toolkit:0.3.18'
}
}
```
Expand Down Expand Up @@ -206,6 +206,11 @@ Default: `true`

If set to true, then custom check tasks will also run tests and test results will be copied to `results/test` directory.

#### ignoreTestErrors
Default: `false`

If set to true, then verification tasks won't fail due to failed tests.

#### configureCheckstyle
Default: `true`

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ class ToolkitConfiguration {
def boolean configureCoverage = false
def boolean useJava8 = false;
def boolean appendVersionNameToAPK = false;

def boolean configureTests = true;
def boolean ignoreTestErrors = false;

def boolean configureCheckstyle = true;
def boolean ignoreCheckstyleFailures = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.infullmobile.toolkit.impl.android
import com.infullmobile.toolkit.impl.android.commands.variant.ConfigureCheckstyleForVariant
import com.infullmobile.toolkit.impl.android.commands.variant.ConfigureFindbugsInVariant
import com.infullmobile.toolkit.impl.android.commands.variant.ConfigureLintForVariant
import com.infullmobile.toolkit.impl.android.commands.variant.ConfigureTestsForVariant
import com.infullmobile.toolkit.impl.android.commands.variant.CopyTestResultsCommand
import com.infullmobile.toolkit.types.IProjectConfigurator

Expand All @@ -22,6 +23,7 @@ class VariantConfigurator extends IProjectConfigurator {
new ConfigureCheckstyleForVariant(),
new ConfigureFindbugsInVariant(),
new CopyTestResultsCommand(),
new ConfigureTestsForVariant()
)
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package com.infullmobile.toolkit.impl.android.commands.variant

import com.infullmobile.toolkit.impl.android.IVariantConfigCommand
import com.infullmobile.toolkit.impl.android.TestVariantWrapper
import com.infullmobile.toolkit.impl.android.VariantConfigurator
import com.infullmobile.toolkit.types.IProjectConfigurator

/**
* Created by Adam Kobus on 26.09.2016.
* Copyright (c) 2016, inFullMobile
* License: MIT, file: /LICENSE
*/
class ConfigureTestsForVariant extends IVariantConfigCommand {

@Override
boolean isCommandAllowed(IProjectConfigurator configurator) {
return config.configureTests;
}

@Override
protected performCommandWith(VariantConfigurator variantConfigurator) {
variantWrapper.testVariants.each { TestVariantWrapper testVariant ->
def variant = testVariant.variant
def variantData = variant.variantData
String taskDependency;
def boolean isConnected = (testVariant.type == TestVariantWrapper.TestType.CONNECTED)

if (isConnected) {
taskDependency = variantData.connectedTestTask.name
} else {
taskDependency = "test${variantData.variantDependency.name.capitalize()}"
}
def task = configuredProject.tasks.findByPath(taskDependency)
task.ignoreFailures = config.ignoreTestErrors
}
}
}

0 comments on commit 7b643ef

Please sign in to comment.