From 413ac1b08b80996f90418e712264ae172a499ff6 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 9 Oct 2017 10:48:52 -0700 Subject: [PATCH] US179127: Small fix on content type in order to be able to serialize the incoming result of the Predix Audit service --- .../java/com/ge/predix/integration/test/PredixAuditIT.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PredixAuditIT.java b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PredixAuditIT.java index 2f49e4d5..e6d2f56d 100644 --- a/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PredixAuditIT.java +++ b/acs-integration-tests/src/test/java/com/ge/predix/integration/test/PredixAuditIT.java @@ -17,6 +17,7 @@ package com.ge.predix.integration.test; import java.time.Instant; +import java.util.Collections; import org.apache.http.client.HttpClient; import org.apache.http.impl.client.HttpClientBuilder; @@ -24,6 +25,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.security.oauth2.client.OAuth2RestTemplate; @@ -73,7 +75,6 @@ public void setup() { resource.setAccessTokenUri(this.auditUaaUrl); resource.setClientId(this.auditClientId); resource.setClientSecret(this.auditClientSecret); - this.auditRestTemplate = new OAuth2RestTemplate(resource); HttpClient httpClient = HttpClientBuilder.create().useSystemProperties().build(); HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(httpClient); @@ -86,12 +87,12 @@ public void testAudit() throws Exception { this.zoneHelper.createTestZone(this.acsRestTemplateFactory.getACSTemplateWithPolicyScope(), "predix-audit-zone", true); HttpHeaders headers = ACSTestUtil.httpHeaders(); + headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON)); headers.add("Predix-Zone-Id", this.auditZoneId); Thread.sleep(5000); PredixAuditRequest request = new PredixAuditRequest(1, 10, startTime, Instant.now().toEpochMilli()); ResponseEntity response = this.auditRestTemplate.postForEntity(this.auditQueryUrl, new HttpEntity<>(request, headers), PredixAuditResponse.class); - Assert.assertTrue(response.getBody().getContent().size() >= 1); }