Removed most of deprecations; fixes gh-1570

specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/HttpHeadersTests.java

@@ -27,368 +27,301 @@ class HttpHeadersTests {
 	@Test
 	public void ACCEPT() {
 		BDDAssertions.then(HttpHeaders.ACCEPT).isEqualTo("Accept");
-		BDDAssertions.then(new HttpHeaders().accept()).isEqualTo(HttpHeaders.ACCEPT);
 	}
 
 	@Test
 	public void ACCEPT_CHARSET() {
 		BDDAssertions.then(HttpHeaders.ACCEPT_CHARSET).isEqualTo("Accept-Charset");
-		BDDAssertions.then(new HttpHeaders().acceptCharset()).isEqualTo(HttpHeaders.ACCEPT_CHARSET);
 	}
 
 	@Test
 	public void ACCEPT_ENCODING() {
 		BDDAssertions.then(HttpHeaders.ACCEPT_ENCODING).isEqualTo("Accept-Encoding");
-		BDDAssertions.then(new HttpHeaders().acceptEncoding()).isEqualTo(HttpHeaders.ACCEPT_ENCODING);
 	}
 
 	@Test
 	public void ACCEPT_LANGUAGE() {
 		BDDAssertions.then(HttpHeaders.ACCEPT_LANGUAGE).isEqualTo("Accept-Language");
-		BDDAssertions.then(new HttpHeaders().acceptLanguage()).isEqualTo(HttpHeaders.ACCEPT_LANGUAGE);
 	}
 
 	@Test
 	public void ACCEPT_RANGES() {
 		BDDAssertions.then(HttpHeaders.ACCEPT_RANGES).isEqualTo("Accept-Ranges");
-		BDDAssertions.then(new HttpHeaders().acceptRanges()).isEqualTo(HttpHeaders.ACCEPT_RANGES);
 	}
 
 	@Test
 	public void ACCESS_CONTROL_ALLOW_CREDENTIALS() {
 		BDDAssertions.then(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS).isEqualTo("Access-Control-Allow-Credentials");
-		BDDAssertions.then(new HttpHeaders().accessControlAllowCredentials())
-				.isEqualTo(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS);
 	}
 
 	@Test
 	public void ACCESS_CONTROL_ALLOW_HEADERS() {
 		BDDAssertions.then(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS).isEqualTo("Access-Control-Allow-Headers");
-		BDDAssertions.then(new HttpHeaders().accessControlAllowHeaders())
-				.isEqualTo(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS);
 	}
 
 	@Test
 	public void ACCESS_CONTROL_ALLOW_METHODS() {
 		BDDAssertions.then(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS).isEqualTo("Access-Control-Allow-Methods");
-		BDDAssertions.then(new HttpHeaders().accessControlAllowMethods())
-				.isEqualTo(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS);
 	}
 
 	@Test
 	public void ACCESS_CONTROL_ALLOW_ORIGIN() {
 		BDDAssertions.then(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN).isEqualTo("Access-Control-Allow-Origin");
-		BDDAssertions.then(new HttpHeaders().accessControlAllowOrigin())
-				.isEqualTo(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN);
 	}
 
 	@Test
 	public void ACCESS_CONTROL_EXPOSE_HEADERS() {
 		BDDAssertions.then(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS).isEqualTo("Access-Control-Expose-Headers");
-		BDDAssertions.then(new HttpHeaders().accessControlExposeHeaders())
-				.isEqualTo(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS);
 	}
 
 	@Test
 	public void ACCESS_CONTROL_MAX_AGE() {
 		BDDAssertions.then(HttpHeaders.ACCESS_CONTROL_MAX_AGE).isEqualTo("Access-Control-Max-Age");
-		BDDAssertions.then(new HttpHeaders().accessControlMaxAge()).isEqualTo(HttpHeaders.ACCESS_CONTROL_MAX_AGE);
 	}
 
 	@Test
 	public void ACCESS_CONTROL_REQUEST_HEADERS() {
 		BDDAssertions.then(HttpHeaders.ACCESS_CONTROL_REQUEST_HEADERS).isEqualTo("Access-Control-Request-Headers");
-		BDDAssertions.then(new HttpHeaders().accessControlRequestHeaders())
-				.isEqualTo(HttpHeaders.ACCESS_CONTROL_REQUEST_HEADERS);
 	}
 
 	@Test
 	public void ACCESS_CONTROL_REQUEST_METHOD() {
 		BDDAssertions.then(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD).isEqualTo("Access-Control-Request-Method");
-		BDDAssertions.then(new HttpHeaders().accessControlRequestMethod())
-				.isEqualTo(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD);
 	}
 
 	@Test
 	public void AGE() {
 		BDDAssertions.then(HttpHeaders.AGE).isEqualTo("Age");
-		BDDAssertions.then(new HttpHeaders().age()).isEqualTo(HttpHeaders.AGE);
 	}
 
 	@Test
 	public void ALLOW() {
 		BDDAssertions.then(HttpHeaders.ALLOW).isEqualTo("Allow");
-		BDDAssertions.then(new HttpHeaders().allow()).isEqualTo(HttpHeaders.ALLOW);
 	}
 
 	@Test
 	public void AUTHORIZATION() {
 		BDDAssertions.then(HttpHeaders.AUTHORIZATION).isEqualTo("Authorization");
-		BDDAssertions.then(new HttpHeaders().authorization()).isEqualTo(HttpHeaders.AUTHORIZATION);
 	}
 
 	@Test
 	public void CACHE_CONTROL() {
 		BDDAssertions.then(HttpHeaders.CACHE_CONTROL).isEqualTo("Cache-Control");
-		BDDAssertions.then(new HttpHeaders().cacheControl()).isEqualTo(HttpHeaders.CACHE_CONTROL);
 	}
 
 	@Test
 	public void CONNECTION() {
 		BDDAssertions.then(HttpHeaders.CONNECTION).isEqualTo("Connection");
-		BDDAssertions.then(new HttpHeaders().connection()).isEqualTo(HttpHeaders.CONNECTION);
 	}
 
 	@Test
 	public void CONTENT_ENCODING() {
 		BDDAssertions.then(HttpHeaders.CONTENT_ENCODING).isEqualTo("Content-Encoding");
-		BDDAssertions.then(new HttpHeaders().contentEncoding()).isEqualTo(HttpHeaders.CONTENT_ENCODING);
 	}
 
 	@Test
 	public void CONTENT_DISPOSITION() {
 		BDDAssertions.then(HttpHeaders.CONTENT_DISPOSITION).isEqualTo("Content-Disposition");
-		BDDAssertions.then(new HttpHeaders().contentDisposition()).isEqualTo(HttpHeaders.CONTENT_DISPOSITION);
 	}
 
 	@Test
 	public void CONTENT_LANGUAGE() {
 		BDDAssertions.then(HttpHeaders.CONTENT_LANGUAGE).isEqualTo("Content-Language");
-		BDDAssertions.then(new HttpHeaders().contentLanguage()).isEqualTo(HttpHeaders.CONTENT_LANGUAGE);
 	}
 
 	@Test
 	public void CONTENT_LENGTH() {
 		BDDAssertions.then(HttpHeaders.CONTENT_LENGTH).isEqualTo("Content-Length");
-		BDDAssertions.then(new HttpHeaders().contentLength()).isEqualTo(HttpHeaders.CONTENT_LENGTH);
 	}
 
 	@Test
 	public void CONTENT_LOCATION() {
 		BDDAssertions.then(HttpHeaders.CONTENT_LOCATION).isEqualTo("Content-Location");
-		BDDAssertions.then(new HttpHeaders().contentLocation()).isEqualTo(HttpHeaders.CONTENT_LOCATION);
 	}
 
 	@Test
 	public void CONTENT_RANGE() {
 		BDDAssertions.then(HttpHeaders.CONTENT_RANGE).isEqualTo("Content-Range");
-		BDDAssertions.then(new HttpHeaders().contentRange()).isEqualTo(HttpHeaders.CONTENT_RANGE);
 	}
 
 	@Test
 	public void CONTENT_TYPE() {
 		BDDAssertions.then(HttpHeaders.CONTENT_TYPE).isEqualTo("Content-Type");
-		BDDAssertions.then(new HttpHeaders().contentType()).isEqualTo(HttpHeaders.CONTENT_TYPE);
 	}
 
 	@Test
 	public void COOKIE() {
 		BDDAssertions.then(HttpHeaders.COOKIE).isEqualTo("Cookie");
-		BDDAssertions.then(new HttpHeaders().cookie()).isEqualTo(HttpHeaders.COOKIE);
 	}
 
 	@Test
 	public void DATE() {
 		BDDAssertions.then(HttpHeaders.DATE).isEqualTo("Date");
-		BDDAssertions.then(new HttpHeaders().date()).isEqualTo(HttpHeaders.DATE);
 	}
 
 	@Test
 	public void ETAG() {
 		BDDAssertions.then(HttpHeaders.ETAG).isEqualTo("ETag");
-		BDDAssertions.then(new HttpHeaders().etag()).isEqualTo(HttpHeaders.ETAG);
 	}
 
 	@Test
 	public void EXPECT() {
 		BDDAssertions.then(HttpHeaders.EXPECT).isEqualTo("Expect");
-		BDDAssertions.then(new HttpHeaders().expect()).isEqualTo(HttpHeaders.EXPECT);
 	}
 
 	@Test
 	public void EXPIRES() {
 		BDDAssertions.then(HttpHeaders.EXPIRES).isEqualTo("Expires");
-		BDDAssertions.then(new HttpHeaders().expires()).isEqualTo(HttpHeaders.EXPIRES);
 	}
 
 	@Test
 	public void FROM() {
 		BDDAssertions.then(HttpHeaders.FROM).isEqualTo("From");
-		BDDAssertions.then(new HttpHeaders().from()).isEqualTo(HttpHeaders.FROM);
 	}
 
 	@Test
 	public void HOST() {
 		BDDAssertions.then(HttpHeaders.HOST).isEqualTo("Host");
-		BDDAssertions.then(new HttpHeaders().host()).isEqualTo(HttpHeaders.HOST);
 	}
 
 	@Test
 	public void IF_MATCH() {
 		BDDAssertions.then(HttpHeaders.IF_MATCH).isEqualTo("If-Match");
-		BDDAssertions.then(new HttpHeaders().ifMatch()).isEqualTo(HttpHeaders.IF_MATCH);
 	}
 
 	@Test
 	public void IF_MODIFIED_SINCE() {
 		BDDAssertions.then(HttpHeaders.IF_MODIFIED_SINCE).isEqualTo("If-Modified-Since");
-		BDDAssertions.then(new HttpHeaders().ifModifiedSince()).isEqualTo(HttpHeaders.IF_MODIFIED_SINCE);
 	}
 
 	@Test
 	public void IF_NONE_MATCH() {
 		BDDAssertions.then(HttpHeaders.IF_NONE_MATCH).isEqualTo("If-None-Match");
-		BDDAssertions.then(new HttpHeaders().ifNoneMatch()).isEqualTo(HttpHeaders.IF_NONE_MATCH);
 	}
 
 	@Test
 	public void IF_RANGE() {
 		BDDAssertions.then(HttpHeaders.IF_RANGE).isEqualTo("If-Range");
-		BDDAssertions.then(new HttpHeaders().ifRange()).isEqualTo(HttpHeaders.IF_RANGE);
 	}
 
 	@Test
 	public void IF_UNMODIFIED_SINCE() {
 		BDDAssertions.then(HttpHeaders.IF_UNMODIFIED_SINCE).isEqualTo("If-Unmodified-Since");
-		BDDAssertions.then(new HttpHeaders().ifUnmodifiedSince()).isEqualTo(HttpHeaders.IF_UNMODIFIED_SINCE);
 	}
 
 	@Test
 	public void LAST_MODIFIED() {
 		BDDAssertions.then(HttpHeaders.LAST_MODIFIED).isEqualTo("Last-Modified");
-		BDDAssertions.then(new HttpHeaders().lastModified()).isEqualTo(HttpHeaders.LAST_MODIFIED);
 	}
 
 	@Test
 	public void LINK() {
 		BDDAssertions.then(HttpHeaders.LINK).isEqualTo("Link");
-		BDDAssertions.then(new HttpHeaders().link()).isEqualTo(HttpHeaders.LINK);
 	}
 
 	@Test
 	public void LOCATION() {
 		BDDAssertions.then(HttpHeaders.LOCATION).isEqualTo("Location");
-		BDDAssertions.then(new HttpHeaders().location()).isEqualTo(HttpHeaders.LOCATION);
 	}
 
 	@Test
 	public void MAX_FORWARDS() {
 		BDDAssertions.then(HttpHeaders.MAX_FORWARDS).isEqualTo("Max-Forwards");
-		BDDAssertions.then(new HttpHeaders().max_forwards()).isEqualTo(HttpHeaders.MAX_FORWARDS);
 	}
 
 	@Test
 	public void ORIGIN() {
 		BDDAssertions.then(HttpHeaders.ORIGIN).isEqualTo("Origin");
-		BDDAssertions.then(new HttpHeaders().origin()).isEqualTo(HttpHeaders.ORIGIN);
 	}
 
 	@Test
 	public void PRAGMA() {
 		BDDAssertions.then(HttpHeaders.PRAGMA).isEqualTo("Pragma");
-		BDDAssertions.then(new HttpHeaders().pragma()).isEqualTo(HttpHeaders.PRAGMA);
 	}
 
 	@Test
 	public void PROXY_AUTHENTICATE() {
 		BDDAssertions.then(HttpHeaders.PROXY_AUTHENTICATE).isEqualTo("Proxy-Authenticate");
-		BDDAssertions.then(new HttpHeaders().proxyAuthenticate()).isEqualTo(HttpHeaders.PROXY_AUTHENTICATE);
 	}
 
 	@Test
 	public void PROXY_AUTHORIZATION() {
 		BDDAssertions.then(HttpHeaders.PROXY_AUTHORIZATION).isEqualTo("Proxy-Authorization");
-		BDDAssertions.then(new HttpHeaders().proxyAuthorization()).isEqualTo(HttpHeaders.PROXY_AUTHORIZATION);
 	}
 
 	@Test
 	public void RANGE() {
 		BDDAssertions.then(HttpHeaders.RANGE).isEqualTo("Range");
-		BDDAssertions.then(new HttpHeaders().range()).isEqualTo(HttpHeaders.RANGE);
 	}
 
 	@Test
 	public void REFERER() {
 		BDDAssertions.then(HttpHeaders.REFERER).isEqualTo("Referer");
-		BDDAssertions.then(new HttpHeaders().referer()).isEqualTo(HttpHeaders.REFERER);
 	}
 
 	@Test
 	public void RETRY_AFTER() {
 		BDDAssertions.then(HttpHeaders.RETRY_AFTER).isEqualTo("Retry-After");
-		BDDAssertions.then(new HttpHeaders().retryAfter()).isEqualTo(HttpHeaders.RETRY_AFTER);
 	}
 
 	@Test
 	public void SERVER() {
 		BDDAssertions.then(HttpHeaders.SERVER).isEqualTo("Server");
-		BDDAssertions.then(new HttpHeaders().server()).isEqualTo(HttpHeaders.SERVER);
 	}
 
 	@Test
 	public void SET_COOKIE() {
 		BDDAssertions.then(HttpHeaders.SET_COOKIE).isEqualTo("Set-Cookie");
-		BDDAssertions.then(new HttpHeaders().setCookie()).isEqualTo(HttpHeaders.SET_COOKIE);
 	}
 
 	@Test
 	public void SET_COOKIE_2() {
 		BDDAssertions.then(HttpHeaders.SET_COOKIE_2).isEqualTo("Set-Cookie2");
-		BDDAssertions.then(new HttpHeaders().setCookie2()).isEqualTo(HttpHeaders.SET_COOKIE_2);
 	}
 
 	@Test
 	public void TE() {
 		BDDAssertions.then(HttpHeaders.TE).isEqualTo("TE");
-		BDDAssertions.then(new HttpHeaders().te()).isEqualTo(HttpHeaders.TE);
 	}
 
 	@Test
 	public void TRAILER() {
 		BDDAssertions.then(HttpHeaders.TRAILER).isEqualTo("Trailer");
-		BDDAssertions.then(new HttpHeaders().trailer()).isEqualTo(HttpHeaders.TRAILER);
 	}
 
 	@Test
 	public void TRANSFER_ENCODING() {
 		BDDAssertions.then(HttpHeaders.TRANSFER_ENCODING).isEqualTo("Transfer-Encoding");
-		BDDAssertions.then(new HttpHeaders().transferEncoding()).isEqualTo(HttpHeaders.TRANSFER_ENCODING);
 	}
 
 	@Test
 	public void UPGRADE() {
 		BDDAssertions.then(HttpHeaders.UPGRADE).isEqualTo("Upgrade");
-		BDDAssertions.then(new HttpHeaders().upgrade()).isEqualTo(HttpHeaders.UPGRADE);
 	}
 
 	@Test
 	public void USER_AGENT() {
 		BDDAssertions.then(HttpHeaders.USER_AGENT).isEqualTo("User-Agent");
-		BDDAssertions.then(new HttpHeaders().user_agent()).isEqualTo(HttpHeaders.USER_AGENT);
 	}
 
 	@Test
 	public void VARY() {
 		BDDAssertions.then(HttpHeaders.VARY).isEqualTo("Vary");
-		BDDAssertions.then(new HttpHeaders().vary()).isEqualTo(HttpHeaders.VARY);
 	}
 
 	@Test
 	public void VIA() {
 		BDDAssertions.then(HttpHeaders.VIA).isEqualTo("Via");
-		BDDAssertions.then(new HttpHeaders().via()).isEqualTo(HttpHeaders.VIA);
 	}
 
 	@Test
 	public void WARNING() {
 		BDDAssertions.then(HttpHeaders.WARNING).isEqualTo("Warning");
-		BDDAssertions.then(new HttpHeaders().warning()).isEqualTo(HttpHeaders.WARNING);
 	}
 
 	@Test
 	public void WWW_AUTHENTICATE() {
 		BDDAssertions.then(HttpHeaders.WWW_AUTHENTICATE).isEqualTo("WWW-Authenticate");
-		BDDAssertions.then(new HttpHeaders().wwwAuthenticate()).isEqualTo(HttpHeaders.WWW_AUTHENTICATE);
 	}
 
 }

specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/HttpMethodsTests.java

@@ -27,49 +27,41 @@ class HttpMethodsTests {
 	@Test
 	public void GET() {
 		BDDAssertions.then(HttpMethods.GET).isEqualTo("GET");
-		BDDAssertions.then(new HttpMethods().GET().getMethodName()).isEqualTo(HttpMethods.GET);
 	}
 
 	@Test
 	public void HEAD() {
 		BDDAssertions.then(HttpMethods.HEAD).isEqualTo("HEAD");
-		BDDAssertions.then(new HttpMethods().HEAD().getMethodName()).isEqualTo(HttpMethods.HEAD);
 	}
 
 	@Test
 	public void POST() {
 		BDDAssertions.then(HttpMethods.POST).isEqualTo("POST");
-		BDDAssertions.then(new HttpMethods().POST().getMethodName()).isEqualTo(HttpMethods.POST);
 	}
 
 	@Test
 	public void PUT() {
 		BDDAssertions.then(HttpMethods.PUT).isEqualTo("PUT");
-		BDDAssertions.then(new HttpMethods().PUT().getMethodName()).isEqualTo(HttpMethods.PUT);
 	}
 
 	@Test
 	public void PATCH() {
 		BDDAssertions.then(HttpMethods.PATCH).isEqualTo("PATCH");
-		BDDAssertions.then(new HttpMethods().PATCH().getMethodName()).isEqualTo(HttpMethods.PATCH);
 	}
 
 	@Test
 	public void DELETE() {
 		BDDAssertions.then(HttpMethods.DELETE).isEqualTo("DELETE");
-		BDDAssertions.then(new HttpMethods().DELETE().getMethodName()).isEqualTo(HttpMethods.DELETE);
 	}
 
 	@Test
 	public void OPTIONS() {
 		BDDAssertions.then(HttpMethods.OPTIONS).isEqualTo("OPTIONS");
-		BDDAssertions.then(new HttpMethods().OPTIONS().getMethodName()).isEqualTo(HttpMethods.OPTIONS);
 	}
 
 	@Test
 	public void TRACE() {
 		BDDAssertions.then(HttpMethods.TRACE).isEqualTo("TRACE");
-		BDDAssertions.then(new HttpMethods().TRACE().getMethodName()).isEqualTo(HttpMethods.TRACE);
 	}
 
 }

specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/MediaTypesTests.java

@@ -27,104 +27,86 @@ class MediaTypesTests {
 	@Test
 	public void ALL_VALUE() {
 		BDDAssertions.then(MediaTypes.ALL_VALUE).isEqualTo("*/*");
-		BDDAssertions.then(new MediaTypes().allValue()).isEqualTo(MediaTypes.ALL_VALUE);
 	}
 
 	@Test
 	public void APPLICATION_ATOM_XML() {
 		BDDAssertions.then(MediaTypes.APPLICATION_ATOM_XML).isEqualTo("application/atom+xml");
-		BDDAssertions.then(new MediaTypes().applicationAtomXml()).isEqualTo(MediaTypes.APPLICATION_ATOM_XML);
 	}
 
 	@Test
 	public void APPLICATION_FORM_URLENCODED() {
 		BDDAssertions.then(MediaTypes.APPLICATION_FORM_URLENCODED).isEqualTo("application/x-www-form-urlencoded");
-		BDDAssertions.then(new MediaTypes().applicationFormUrlencoded())
-				.isEqualTo(MediaTypes.APPLICATION_FORM_URLENCODED);
 	}
 
 	@Test
 	public void APPLICATION_JSON() {
 		BDDAssertions.then(MediaTypes.APPLICATION_JSON).isEqualTo("application/json");
-		BDDAssertions.then(new MediaTypes().applicationJson()).isEqualTo(MediaTypes.APPLICATION_JSON);
 	}
 
 	@Test
 	public void APPLICATION_JSON_UTF8() {
 		BDDAssertions.then(MediaTypes.APPLICATION_JSON_UTF8).isEqualTo("application/json;charset=UTF-8");
-		BDDAssertions.then(new MediaTypes().applicationJsonUtf8()).isEqualTo(MediaTypes.APPLICATION_JSON_UTF8);
 	}
 
 	@Test
 	public void APPLICATION_OCTET_STREAM() {
 		BDDAssertions.then(MediaTypes.APPLICATION_OCTET_STREAM).isEqualTo("application/octet-stream");
-		BDDAssertions.then(new MediaTypes().applicationOctetStream()).isEqualTo(MediaTypes.APPLICATION_OCTET_STREAM);
 	}
 
 	@Test
 	public void APPLICATION_PDF() {
 		BDDAssertions.then(MediaTypes.APPLICATION_PDF).isEqualTo("application/pdf");
-		BDDAssertions.then(new MediaTypes().applicationPdf()).isEqualTo(MediaTypes.APPLICATION_PDF);
 	}
 
 	@Test
 	public void APPLICATION_XHTML_XML() {
 		BDDAssertions.then(MediaTypes.APPLICATION_XHTML_XML).isEqualTo("application/xhtml+xml");
-		BDDAssertions.then(new MediaTypes().applicationXhtmlXml()).isEqualTo(MediaTypes.APPLICATION_XHTML_XML);
 	}
 
 	@Test
 	public void APPLICATION_XML() {
 		BDDAssertions.then(MediaTypes.APPLICATION_XML).isEqualTo("application/xml");
-		BDDAssertions.then(new MediaTypes().applicationXml()).isEqualTo(MediaTypes.APPLICATION_XML);
 	}
 
 	@Test
 	public void IMAGE_GIF() {
 		BDDAssertions.then(MediaTypes.IMAGE_GIF).isEqualTo("image/gif");
-		BDDAssertions.then(new MediaTypes().imageGif()).isEqualTo(MediaTypes.IMAGE_GIF);
 	}
 
 	@Test
 	public void IMAGE_JPEG() {
 		BDDAssertions.then(MediaTypes.IMAGE_JPEG).isEqualTo("image/jpeg");
-		BDDAssertions.then(new MediaTypes().imageJpeg()).isEqualTo(MediaTypes.IMAGE_JPEG);
 	}
 
 	@Test
 	public void IMAGE_PNG() {
 		BDDAssertions.then(MediaTypes.IMAGE_PNG).isEqualTo("image/png");
-		BDDAssertions.then(new MediaTypes().imagePng()).isEqualTo(MediaTypes.IMAGE_PNG);
 	}
 
 	@Test
 	public void MULTIPART_FORM_DATA() {
 		BDDAssertions.then(MediaTypes.MULTIPART_FORM_DATA).isEqualTo("multipart/form-data");
-		BDDAssertions.then(new MediaTypes().multipartFormData()).isEqualTo(MediaTypes.MULTIPART_FORM_DATA);
 	}
 
 	@Test
 	public void TEXT_HTML() {
 		BDDAssertions.then(MediaTypes.TEXT_HTML).isEqualTo("text/html");
-		BDDAssertions.then(new MediaTypes().textHtml()).isEqualTo(MediaTypes.TEXT_HTML);
 	}
 
 	@Test
 	public void TEXT_MARKDOWN() {
 		BDDAssertions.then(MediaTypes.TEXT_MARKDOWN).isEqualTo("text/markdown");
-		BDDAssertions.then(new MediaTypes().textMarkdown()).isEqualTo(MediaTypes.TEXT_MARKDOWN);
 	}
 
 	@Test
 	public void TEXT_PLAIN() {
 		BDDAssertions.then(MediaTypes.TEXT_PLAIN).isEqualTo("text/plain");
-		BDDAssertions.then(new MediaTypes().textPlain()).isEqualTo(MediaTypes.TEXT_PLAIN);
 	}
 
 	@Test
 	public void TEXT_XML() {
 		BDDAssertions.then(MediaTypes.TEXT_XML).isEqualTo("text/xml");
-		BDDAssertions.then(new MediaTypes().textXml()).isEqualTo(MediaTypes.TEXT_XML);
 	}
 
 }

specs/spring-cloud-contract-spec-java/src/test/groovy/org/springframework/cloud/contract/spec/internal/MessagingHeadersTests.java

@@ -27,8 +27,6 @@ class MessagingHeadersTests {
 	@Test
 	public void MESSAGING_CONTENT_TYPE() {
 		BDDAssertions.then(MessagingHeaders.MESSAGING_CONTENT_TYPE).isEqualTo("contentType");
-		BDDAssertions.then(new MessagingHeaders().messagingContentType())
-				.isEqualTo(MessagingHeaders.MESSAGING_CONTENT_TYPE);
 	}
 
 }