implement the nested configuration for proxy settings

This commit is contained in:
ma wei
2015-08-25 19:11:27 +08:00
parent 519198bb61
commit ddb8c432be
5 changed files with 52 additions and 24 deletions

View File

@@ -48,10 +48,10 @@ class DependencyCheckGradlePluginSpec extends PluginProjectSpec {
expect:
task.group == 'Dependency Check'
task.description == 'Produce dependency security report.'
project.dependencyCheck.proxyServer == null
project.dependencyCheck.proxyPort == null
project.dependencyCheck.proxyUsername == null
project.dependencyCheck.proxyPassword == null
project.dependencyCheck.proxy.server == null
project.dependencyCheck.proxy.port == null
project.dependencyCheck.proxy.username == null
project.dependencyCheck.proxy.password == null
project.dependencyCheck.cveUrl12Modified == null
project.dependencyCheck.cveUrl20Modified == null
project.dependencyCheck.cveStartYear == null
@@ -64,10 +64,12 @@ class DependencyCheckGradlePluginSpec extends PluginProjectSpec {
def 'tasks use correct values when extension is used'() {
when:
project.dependencyCheck {
proxyServer = '127.0.0.1'
proxyPort = 3128
proxyUsername = 'proxyUsername'
proxyPassword = 'proxyPassword'
proxy {
server = '127.0.0.1'
port = 3128
username = 'proxyUsername'
password = 'proxyPassword'
}
cveUrl12Modified = 'cveUrl12Modified'
cveUrl20Modified = 'cveUrl20Modified'
cveStartYear = 2002
@@ -78,10 +80,10 @@ class DependencyCheckGradlePluginSpec extends PluginProjectSpec {
}
then:
project.dependencyCheck.proxyServer == '127.0.0.1'
project.dependencyCheck.proxyPort == 3128
project.dependencyCheck.proxyUsername == 'proxyUsername'
project.dependencyCheck.proxyPassword == 'proxyPassword'
project.dependencyCheck.proxy.server == '127.0.0.1'
project.dependencyCheck.proxy.port == 3128
project.dependencyCheck.proxy.username == 'proxyUsername'
project.dependencyCheck.proxy.password == 'proxyPassword'
project.dependencyCheck.cveUrl12Modified == 'cveUrl12Modified'
project.dependencyCheck.cveUrl20Modified == 'cveUrl20Modified'
project.dependencyCheck.cveStartYear == 2002