jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2024-12-14 11:03:09 +02:00
Code Issues Releases Activity

Improve coverage

Browse Source
This commit is contained in:
Sven Merk 2019-03-13 11:38:44 +01:00
parent cd8067b5d5
commit 088c5901e7
4 changed files with 66 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/sap/piper/integration/WhitesourceRepository.groovy
View File

@ -193,7 +193,7 @@ class WhitesourceRepository implements Serializable {
def response = script.httpRequest(params)
if(config.verbose)
script.echo "Received response ${reponse}"
script.echo "Received response ${response}"
return response
}

5
test/groovy/com/sap/piper/DescriptorUtilsTest.groovy
View File

@ -12,6 +12,8 @@ import util.JenkinsLoggingRule
import util.JenkinsSetupRule
import util.LibraryLoadingTestExecutionListener
import static org.assertj.core.api.Assertions.assertThat
import static org.hamcrest.Matchers.is
import static org.junit.Assert.assertEquals
import static org.junit.Assert.assertThat
import static org.hamcrest.core.Is.*
@ -83,12 +85,15 @@ class DescriptorUtilsTest extends BasePiperTest {
return new JsonUtils().parseJsonSerializable(packageJsonFile.text)
})
def errorCaught = false
try {
descriptorUtils.getNpmGAV('package3.json')
} catch (e) {
errorCaught = true
assertThat(e, isA(AbortException.class))
assertThat(e.getMessage(), is("Unable to parse package name '@someerror'"))
}
assertThat(errorCaught, is(true))
}
@Test

20
test/groovy/com/sap/piper/integration/WhitesourceOrgAdminRepositoryTest.groovy
View File

@ -45,6 +45,24 @@ class WhitesourceOrgAdminRepositoryTest extends BasePiperTest {
nullScript.env = [:]
}
@Test
void testMissingConfig() {
def errorCaught = false
try {
new WhitesourceOrgAdminRepository(null, [:])
} catch (e) {
errorCaught = true
assertThat(e, isA(AbortException.class))
assertThat(e.getMessage(), is("Parameter 'serviceUrl' must be provided as part of the configuration."))
}
assertThat(errorCaught, is(true))
}
@Test
void testAccessor() {
new WhitesourceOrgAdminRepository(nullScript, [whitesourceAccessor: "com.sap.piper.integration.WhitesourceRepository", serviceUrl: "http://test.com"])
}
@Test
void testResolveProductMeta() {
@ -202,7 +220,7 @@ class WhitesourceOrgAdminRepositoryTest extends BasePiperTest {
def requestParams
helper.registerAllowedMethod('httpRequest', [Map], { p ->
requestParams = p
return [content: "{ \"error\" : \"4546\", \"errorMessage\" : \"some text\" } }"]
return [content: "{ \"errorCode\" : \"4546\", \"errorMessage\" : \"some text\" } }"]
})
def errorCaught = false

44
test/groovy/com/sap/piper/integration/WhitesourceRepositoryTest.groovy
View File

@ -49,6 +49,19 @@ class WhitesourceRepositoryTest extends BasePiperTest {
nullScript.env = [:]
}
@Test
void testMissingConfig() {
def errorCaught = false
try {
new WhitesourceRepository(null, [:])
} catch (e) {
errorCaught = true
assertThat(e, isA(AbortException.class))
assertThat(e.getMessage(), is("Parameter 'serviceUrl' must be provided as part of the configuration."))
}
assertThat(errorCaught, is(true))
}
@Test
void testResolveProjectsMeta() {
def whitesourceMetaResponse = [
@ -233,6 +246,7 @@ class WhitesourceRepositoryTest extends BasePiperTest {
@Test
void testHttpWhitesourceExternalCallNoUserKey() {
def config = [ whitesourceServiceUrl: "https://saas.whitesource.com/api", verbose: true]
repository.config.putAll(config)
def requestBody = "{ \"someJson\" : { \"someObject\" : \"abcdef\" } }"
def requestParams
@ -326,7 +340,7 @@ class WhitesourceRepositoryTest extends BasePiperTest {
@Test
void testFetchReportForProduct() {
repository.config.putAll([ whitesourceServiceUrl: "http://mo-323123123.sap.corp/some", verbose: false, productToken: "4711"])
repository.config.putAll([ whitesourceServiceUrl: "http://mo-323123123.sap.corp/some", verbose: true, productToken: "4711"])
def command
helper.registerAllowedMethod('sh', [String], { cmd ->
command = cmd
@ -340,6 +354,8 @@ curl -o test.file -X POST http://some.host.whitesource.com/api/ -H 'Content-Type
"productToken": "4711"
}'''
))
assertThat(jlr.log, containsString("Sending curl request with parameters [requestType:getProductRiskReport, productToken:4711]"))
}
@Test
@ -380,7 +396,6 @@ curl -o test.file -X POST http://some.host.whitesource.com/api/ -H 'Content-Type
void testFetchProjectLicenseAlerts() {
def projectToken = "8547"
def config = [ serviceUrl: "http://some.host.whitesource.com/api/", userKey: "4711"]
nullScript.env['HTTP_PROXY'] = "http://test.sap.com:8080"
repository.config.putAll(config)
def requestBody = [
@ -412,7 +427,7 @@ curl -o test.file -X POST http://some.host.whitesource.com/api/ -H 'Content-Type
}
@Test
void testFetchProdjectsMetaInfo() {
void testFetchProjectsMetaInfo() {
def config = [ serviceUrl: "http://some.host.whitesource.com/api/", userKey: "4711", productToken: '8475', projectNames: ['testProject1', 'testProject2']]
nullScript.env['HTTP_PROXY'] = "http://test.sap.com:8080"
repository.config.putAll(config)
@ -446,6 +461,29 @@ curl -o test.file -X POST http://some.host.whitesource.com/api/ -H 'Content-Type
assertThat(result, is([[ name: "testProduct1"], [ name: "testProduct2"]]))
}
@Test
void testFetchProjectsMetaInfoError() {
def config = [ serviceUrl: "http://some.host.whitesource.com/api/", userKey: "4711", productName: 'kjdkjkhd', productToken: '8475', projectNames: ['testProject1', 'testProject2']]
repository.config.putAll(config)
def requestParams
helper.registerAllowedMethod('httpRequest', [Map], { p ->
requestParams = p
return [ content: "{ }"]
})
def errorCaught = false
try {
repository.fetchProjectsMetaInfo()
} catch (e) {
errorCaught = true
assertThat(e, isA(AbortException.class))
assertThat(e.getMessage(), is("[WhiteSource] Could not fetch any projects for product '${config.productName}' from backend, response was {}"))
}
assertThat(errorCaught, is(true))
}
@Test
void testFetchVulnerabilitiesOnProjects() {
def config = [ serviceUrl: "http://some.host.whitesource.com/api/", userKey: "4711", productToken: '8475', projectNames: ['testProject1', 'testProject2']]