From b90f1a0d6f0249fea0b3060edfa55925568f79d5 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 16 Apr 2019 10:33:22 +0400 Subject: [PATCH] Polish --- .../verifier/converter/YamlContractConverter.groovy | 4 +--- .../verifier/converter/YamlContractConverterSpec.groovy | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverter.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverter.groovy index 3824f5a0c6..81c37c62bc 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverter.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverter.groovy @@ -41,16 +41,14 @@ class YamlContractConverter implements ContractConverter> { boolean isAccepted(File file) { String name = file.getName() boolean acceptFile = name.endsWith(".yml") || name.endsWith(".yaml") - if (acceptFile){ try { - yamlToContracts.convertFrom(file) + this.yamlToContracts.convertFrom(file) } catch (e) { log.warn("Error Processing yaml file. Skipping Contract Generation ", e) acceptFile = false } } - return acceptFile } diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverterSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverterSpec.groovy index b2f1e22227..fcf6065fa8 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverterSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/YamlContractConverterSpec.groovy @@ -89,10 +89,8 @@ class YamlContractConverterSpec extends Specification { URL ymlRestXmlFile = YamlContractConverterSpec. getResource("/yml/contract_rest_xml.yml") File ymlRestXml = new File(ymlRestXmlFile.toURI()) - URL oa3SpecUrl = YamlContractConverterSpec.getResource('/yml/oa3/openapi_petstore.yml') File oa3File = new File(oa3SpecUrl.toURI()) - YamlContractConverter converter = new YamlContractConverter() String xmlContractBody = ''' @@ -1326,7 +1324,7 @@ ignored: false .replaceAll("\n", "").replaceAll(' ', '') } - def "Should accept file"(){ + def "should accept a yaml file that is a proper scc YAML contract"(){ when: def accepted = converter.isAccepted(ymlWithRest3) @@ -1334,7 +1332,7 @@ ignored: false accepted } - def "Should NOT accept file"(){ + def "should not accept a YAML file that is not a scc YAML contract"(){ when: def accepted = converter.isAccepted(oa3File)