Commit Graph

823 Commits

Author SHA1 Message Date
Marcin Grzejszczak
3aa8482f95 Igored checkstyle 2019-08-12 14:53:49 +02:00
Marcin Grzejszczak
3565ef892a Ignored the file dsl based tests 2019-08-12 14:32:46 +02:00
Marcin Grzejszczak
b85b5edb99 Ignored the file dsl based tests 2019-08-12 14:27:12 +02:00
Marcin Grzejszczak
706044bfe5 Added support for writing contracts in Java
fixes gh-1161
2019-08-12 13:40:58 +02:00
Tim Ysewyn
962e626de4 Merge branch 'master' into feature/kotlin-contract-support 2019-08-10 14:05:18 +02:00
Marcin Grzejszczak
909930a6f4 Added failOnInProgress
with this change your plugin can fail the build if you have any in progress contracts

fixes gh-1156
2019-08-08 14:15:24 +02:00
Tim Ysewyn
05f9486852 Merge branch 'master' into feature/kotlin-contract-support 2019-08-07 23:29:55 +02:00
Marcin Grzejszczak
7b60206c77 Added the generateStubs docs 2019-08-07 21:54:24 +02:00
Marcin Grzejszczak
24f8930237 Merge branch 'Buzzardo-new_docs'
fixes gh-1140
fixes gh-1157
2019-08-07 10:59:06 +02:00
Marcin Grzejszczak
2be3d0ab86 Added the option "inProgress" to the contract
without this change we can't have a contract that will generate a stub but not a test. Of course that's for a reason since it's overriding the very essence of contract test.
with this change we assume that the users know what they're doing and that they will use this flag rarerly. Cause it means that you can have a false positive.

related to gh-881
2019-08-06 15:39:32 +02:00
Tim Ysewyn
551d4dde59 Made helper functions static 2019-08-05 20:48:37 +02:00
Tim Ysewyn
b07e50bd8d Removed unwanted changed 2019-08-02 12:09:00 +02:00
Tim Ysewyn
9935b24a25 First implementation based on existing tests 2019-08-02 11:13:45 +02:00
Marcin Grzejszczak
5e84a38377 Revert " Added support for incremental Gradle builds"
This reverts commit 31972419
2019-08-01 14:01:40 +02:00
Marcin Grzejszczak
531fa8ff86 Merge branch 'master' into new_docs 2019-07-31 23:28:12 +02:00
Marcin Grzejszczak
31972419e9 Added support for incremental Gradle builds
fixes gh-1133
2019-07-31 23:26:28 +02:00
Marcin Grzejszczak
3d89adcf88 Working docs 2019-07-25 14:40:21 +02:00
janeisklar
c55031e094 Add TestNG support for spring-cloud-contract-verifier (#1101) (#1135)
fixes #1101
2019-07-12 12:17:12 +02:00
Marcin Grzejszczak
82be516441 Fixed formatting 2019-07-09 18:20:43 +02:00
Marcin Grzejszczak
121b0f1fdf Made destination resolver lazy 2019-07-09 18:17:53 +02:00
Marcin Grzejszczak
869e644740 Fixed resolution of content type when working with WireMock stubs 2019-07-09 17:48:08 +02:00
Marcin Grzejszczak
7f351f8b80 Fixed support for line indentations and line endings 2019-07-09 17:47:43 +02:00
Marcin Grzejszczak
f48895c189 Added back support for interacting with a running broker via stub runner 2019-07-09 17:46:51 +02:00
Marcin Grzejszczak
d99d9e12f3 Merge branch '2.1.x' 2019-07-08 17:50:03 +02:00
Marcin Grzejszczak
a1f308b0cf Fixed unnecessary file renaming for scenarios when converting to yaml; fixes gh-1132 2019-07-08 17:06:24 +02:00
Marcin Grzejszczak
89c213f593 Convert to yaml will use query params; fixes gh-1086 2019-07-08 16:34:29 +02:00
Marcin Grzejszczak
bdc69c2523 Merge branch '2.1.x' 2019-07-08 15:39:40 +02:00
Marcin Grzejszczak
03ce42294c Ensures that execute(...) is resolved properly for YAML conversion; fixes gh-1129 2019-07-08 15:38:56 +02:00
Marcin Grzejszczak
6b9e377487 Rewriting to java (#1131)
* Rewritting to java

- rewritten a lot of Spring Cloud Contract Spec module to Java
- extracted all Groovy stuff to a separate package
- will now continue writing extension modules
- spring-cloud-contract-spec will be written purely in java
- spring-cloud-contract-spec-groovy will have Groovy extensions

fixes gh-1130
2019-07-08 14:15:21 +02:00
buildmaster
1d56bdd1d7 Going back to snapshots 2019-07-03 20:38:29 +00:00
buildmaster
880c7bdb54 Update SNAPSHOT to 2.2.0.M1 2019-07-03 20:31:51 +00:00
Marcin Grzejszczak
78e3c08c32 Bumps Groovy to 2.5.7 and Gradle to 5.5; fixes gh-1046 2019-07-03 10:42:28 +02:00
Marcin Grzejszczak
b48dd4905f Upgraded Rest Assured to 4.0.0; fixes gh-1122 2019-07-02 14:50:20 +02:00
Marcin Grzejszczak
59d3f0d075 Fixed the broken build 2019-07-01 18:31:33 +02:00
Marcin Grzejszczak
b18445ff3f Converted to java 2019-07-01 16:03:22 +02:00
Marcin Grzejszczak
93f2044ef6 Converted to java 2019-07-01 15:48:52 +02:00
Marcin Grzejszczak
a18df67ae8 Added suppresswarnings for all generated tests; fixes gh-1074 2019-07-01 10:49:27 +02:00
Marcin Grzejszczak
d739efc50b Bumped pact to 3.6.7; fixes gh-1099 2019-06-28 17:17:32 +02:00
Olga Maciaszek-Sharma
9ab4a83cd8 Fix failing test. Remove unused assignment. 2019-06-28 11:27:57 +02:00
Marcin Grzejszczak
e792670c7b Fixing wrong json imports 2019-06-28 09:36:43 +02:00
Marcin Grzejszczak
972a50265f Refactored class and method generation (#1116)
following two event storming sessions with @pilloPl and @OlgaMaciaszek and the Spring Cloud Contract community we've decided to refactor the core modules of Spring Cloud Contract Verifier.

The main idea is that the current `JavaTestGenerator`'s implementation no longer uses complex logic to generate classes and methods.

We've introduced abstractions such as:

-    class body builder (to build classes)
-    groovy and java class metadata
-    imports (for various frameworks)
-    default setup for json, xml, restassured, jaxrs
-    class annotations for spock, junit and junit5
-    field insertion e.g. for messaging
2019-06-27 23:01:37 +02:00
Olga Maciaszek-Sharma
954ddfb3d5 Merge branch '2.1.x'
# Conflicts:
#	docker/pom.xml
#	docker/spring-cloud-contract-docker/pom.xml
#	docker/spring-cloud-contract-docker/project/gradle.properties
#	docker/spring-cloud-contract-stub-runner-docker/pom.xml
#	docs/pom.xml
#	pom.xml
#	samples/pom.xml
#	samples/standalone/contracts/com/example/server/pom.xml
#	samples/standalone/dsl/http-client/pom.xml
#	samples/standalone/dsl/http-server/gradle.properties
#	samples/standalone/dsl/http-server/pom.xml
#	samples/standalone/dsl/pom.xml
#	samples/standalone/messaging/pom.xml
#	samples/standalone/messaging/stream-sink/gradle.properties
#	samples/standalone/messaging/stream-sink/pom.xml
#	samples/standalone/messaging/stream-source/gradle.properties
#	samples/standalone/messaging/stream-source/pom.xml
#	samples/standalone/pact/pact-http-client/pom.xml
#	samples/standalone/pact/pact-http-server/gradle.properties
#	samples/standalone/pact/pact-http-server/pom.xml
#	samples/standalone/pact/pom.xml
#	samples/standalone/pom.xml
#	samples/standalone/restdocs/http-client/gradle.properties
#	samples/standalone/restdocs/http-client/pom.xml
#	samples/standalone/restdocs/http-server/gradle.properties
#	samples/standalone/restdocs/http-server/pom.xml
#	samples/standalone/restdocs/pom.xml
#	samples/standalone/webclient/http-client/gradle.properties
#	samples/standalone/webclient/http-client/pom.xml
#	samples/standalone/webclient/http-server/gradle.properties
#	samples/standalone/webclient/http-server/pom.xml
#	samples/standalone/webclient/pom.xml
#	samples/standalone/yml/http-client/pom.xml
#	samples/standalone/yml/http-server/gradle.properties
#	samples/standalone/yml/http-server/pom.xml
#	samples/standalone/yml/pom.xml
#	samples/wiremock-jetty/pom.xml
#	samples/wiremock-native/pom.xml
#	samples/wiremock-tomcat/pom.xml
#	samples/wiremock-undertow-ssl/pom.xml
#	samples/wiremock-undertow/pom.xml
#	samples/wiremock/pom.xml
#	spring-cloud-contract-dependencies/pom.xml
#	spring-cloud-contract-shade/pom.xml
#	spring-cloud-contract-spec/pom.xml
#	spring-cloud-contract-starters/pom.xml
#	spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml
#	spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml
#	spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml
#	spring-cloud-contract-stub-runner-boot/pom.xml
#	spring-cloud-contract-stub-runner/pom.xml
#	spring-cloud-contract-tools/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle.properties
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle.properties
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle.properties
#	spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle.properties
#	spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml
#	spring-cloud-contract-tools/spring-cloud-contract-pact/pom.xml
#	spring-cloud-contract-verifier/pom.xml
#	spring-cloud-contract-wiremock/pom.xml
#	tests/pom.xml
#	tests/samples-messaging-amqp/pom.xml
#	tests/samples-messaging-camel/pom.xml
#	tests/samples-messaging-integration/pom.xml
#	tests/samples-messaging-stream/pom.xml
#	tests/spring-cloud-contract-stub-runner-amqp/pom.xml
#	tests/spring-cloud-contract-stub-runner-boot-eureka/pom.xml
#	tests/spring-cloud-contract-stub-runner-boot-zookeeper/pom.xml
#	tests/spring-cloud-contract-stub-runner-camel/pom.xml
#	tests/spring-cloud-contract-stub-runner-context-path/pom.xml
#	tests/spring-cloud-contract-stub-runner-integration/pom.xml
#	tests/spring-cloud-contract-stub-runner-moco-contract-jar/pom.xml
#	tests/spring-cloud-contract-stub-runner-moco/pom.xml
#	tests/spring-cloud-contract-stub-runner-stream/pom.xml
2019-06-27 15:26:56 +02:00
Artem Ptushkin
de70cd1ef6 Matching strategy at body and contentType issue (#1113)
* Created test for equalToXml and bodyMatchers with xml content type - Failed

* Fixed equalToXml at stub for the equalToXml body and xml content type

* Fixed equalToJson at stub for the equalToJson body and explicit json content type.
If body has matching strategy then it has be used for stub generation.
2019-06-27 15:00:56 +02:00
buildmaster
c9af98eccd Bumping versions to 2.1.3.BUILD-SNAPSHOT after release 2019-06-21 11:25:33 +00:00
buildmaster
d13773adc8 Going back to snapshots 2019-06-21 11:25:32 +00:00
buildmaster
d12c700d34 Update SNAPSHOT to 2.1.2.RELEASE 2019-06-21 11:10:55 +00:00
Artem Ptushkin
b46463e0d3 Fixed issue with content is not allowed in prolog for body from the xml file (#1107)
* Created test 'should create stub with body from the file' - failed

* Fixed 'Content is not allowed in prolog' for body from the xml file; 

fixes issue #1105
2019-06-19 10:17:55 +02:00
Artem Ptushkin
60b9e9e1f0 Fixed MissingMethodExceptionNoStack at creating assertion for spock test (#1110)
* Created test for the issue #1089 - failed with MissingMethodExceptionNoStack
* Created groovy unit test for the issue #1089 - failed with MissingMethodExceptionNoStack
* Fixed MissingMethodExceptionNoStack (#1089)
* Changed SpringCloudContractAssertions to groovy with compileStatic

fixes gh-1089
2019-06-19 10:17:40 +02:00
Artem Ptushkin
3e96da889c Fixed MissingMethodExceptionNoStack at creating assertion for spock test (#1110)
* Created test for the issue #1089 - failed with MissingMethodExceptionNoStack
* Created groovy unit test for the issue #1089 - failed with MissingMethodExceptionNoStack
* Fixed MissingMethodExceptionNoStack (#1089)
* Changed SpringCloudContractAssertions to groovy with compileStatic

fixes gh-1089
2019-06-19 10:16:41 +02:00
Artem Ptushkin
31f43648ac Fixed issue with content is not allowed in prolog for body from the xml file (#1107)
* Created test 'should create stub with body from the file' - failed

* Fixed 'Content is not allowed in prolog' for body from the xml file; 

fixes issue #1105
2019-06-14 15:55:13 +02:00