Commit Graph

3290 Commits

Author SHA1 Message Date
Marcin Grzejszczak
783a7a67bf Upgraded Gradle to 5.5; fixes gh-1124 2019-07-01 13:56:25 +02:00
Marcin Grzejszczak
58f318437c Downgrading autoamaton 2019-07-01 12:50:36 +02:00
Marcin Grzejszczak
ec68535ddd Bumped automaton to 1.12-1 2019-07-01 12:43:00 +02:00
Marcin Grzejszczak
c5c44a57f7 Bumped libs
fixes gh-1123
fixes gh-1121
fixes gh-1120
fixes gh-1119
2019-07-01 10:57:17 +02:00
Marcin Grzejszczak
a18df67ae8 Added suppresswarnings for all generated tests; fixes gh-1074 2019-07-01 10:49:27 +02:00
Spencer Gibb
8949bae485 Moves back to StaticContext from NoContext
NoContext doesn't exist.
2019-06-28 14:51:10 -04:00
Marcin Grzejszczak
d739efc50b Bumped pact to 3.6.7; fixes gh-1099 2019-06-28 17:17:32 +02:00
Marcin Grzejszczak
9c9b19b388 Bumped moco; fixes gh-1117 2019-06-28 14:58:16 +02:00
Marcin Grzejszczak
ebd8555a88 Bumped groovy to 2.4.17; fixes gh-1096 2019-06-28 14:58:16 +02:00
Marcin Grzejszczak
b6cefd6a5e Bumped jgit to 5.3.1; fixes gh-1097 2019-06-28 14:57:59 +02:00
Marcin Grzejszczak
5037f5222b Bumped activemq to 5.15.9; fixes gh-1089 2019-06-28 14:57:59 +02:00
Marcin Grzejszczak
1f249cd840 Bumped Camel to 2.24.0; fixes gh-1090 2019-06-28 14:57:59 +02:00
Marcin Grzejszczak
8fcb454415 Bumped moco; fixes gh-1117 2019-06-28 14:39:29 +02:00
Marcin Grzejszczak
ebd3037d67 Bumped groovy to 2.4.17; fixes gh-1096 2019-06-28 14:25:41 +02:00
Marcin Grzejszczak
e0303fcec6 Bumped jgit to 5.3.1; fixes gh-1097 2019-06-28 14:24:58 +02:00
Marcin Grzejszczak
0dbb331a1c Bumped activemq to 5.15.9; fixes gh-1089 2019-06-28 14:08:32 +02:00
Marcin Grzejszczak
167a5dbc17 Bumped Camel to 2.24.0; fixes gh-1090 2019-06-28 13:51:42 +02:00
Marcin Grzejszczak
ad0cba8bec Merge branch '2.1.x' 2019-06-28 13:24:59 +02:00
Marcin Grzejszczak
92076e9cce Publishing to gradle plugins portal for central profile; fixes gh-1114 2019-06-28 13:24:44 +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
Spencer Gibb
8de9c96abf Bumps spring cloud build to 2.1.7.BUILD-SNAPSHOT
Also other spring deps
2019-06-21 12:57:38 -04: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
Marcin Grzejszczak
f849cb23d9 Merge branch '2.1.x' 2019-06-21 12:56:49 +02:00
Marcin Grzejszczak
0f2c01148c Fixing stream and itegration issus 2019-06-21 12:52:35 +02:00
Spencer Gibb
d7dbe0ccdc Bumps spring cloud build to 2.1.6.BUILD-SNAPSHOT
Also other spring deps
2019-06-20 18:08:11 -04:00
Olga Maciaszek-Sharma
282dacd5f5 Revert "Ignore flaky test."
This reverts commit 04c1115765.
2019-06-20 14:38:26 +02:00
Olga Maciaszek-Sharma
03c556df04 Ignore flaky test. 2019-06-20 14:37:59 +02:00
Olga Maciaszek-Sharma
04c1115765 Ignore flaky test. 2019-06-20 14:36:26 +02: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
Dave Syer
e79e69fb11 Add support for placeholders for port in restdocs with WebTestClient
See gh-1088
2019-06-14 15:32:04 +01:00
Dave Syer
33c8cbfc87 Add support for placeholders in Wiremock stubs (#1109)
* Generate wiremock stubs in restdocs with placeholders for port

* Add support for placeholders in Wiremock stubs

* Ensure response-template transformer is added if needed

fixes gh-1088
2019-06-14 16:15:25 +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
Kamil Duda
e566d02180 Update pom.xml (#1100)
Remove line break
2019-06-14 15:44:03 +02:00
Olga Maciaszek-Sharma
c139851901 Fix gh branch in docs. 2019-06-03 19:43:36 +02:00
Olga Maciaszek-Sharma
d5a631a561 Remove charset from all response content types in samples, as it's been
deprecated in framework.
2019-05-29 22:03:21 +02:00
Olga Maciaszek-Sharma
e0fc7aeca8 Remove charset from pact sample contract media type. Switch to explicitly
returning charset media type for other samples.
2019-05-29 20:50:34 +02:00
Olga Maciaszek-Sharma
bd29f8193f Upgrade stream to Horsham. 2019-05-29 20:49:24 +02:00
Dave Syer
1146674a0e Remove usage of deprecated Jetty API 2019-05-29 10:08:05 +01:00
Marcin Grzejszczak
1c851eafe6 Merge branch '2.1.x' 2019-05-22 11:42:41 +02:00
Marcin Grzejszczak
719ccbe084 http to https 2019-05-22 11:42:32 +02:00
Marcin Grzejszczak
912991ca94 Bumped guava to 27.1-jre; fixes gh-1072 2019-05-20 15:10:23 +02:00
Marcin Grzejszczak
b7dbfb680b Bumped maven-shade-plugin to 3.2.1; fixes gh-1073 2019-05-20 15:06:25 +02:00