Thanks to visit codestin.com
Credit goes to github.com

Skip to content

US179127: Small fix on content type in order to be able to serialize the incoming result of the Predix Audit service #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anubhavi25 merged 1 commit into from
Oct 9, 2017
Merged

US179127: Small fix on content type in order to be able to serialize the incoming result of the Predix Audit service #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions acs-integration-tests/src/test/java/com/ge/predix/integration/test/PredixAuditIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@
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;
import org.springframework.beans.factory.annotation.Autowired;
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;
Expand Down Expand Up @@ -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);
Expand All @@ -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<PredixAuditResponse> response = this.auditRestTemplate.postForEntity(this.auditQueryUrl,
new HttpEntity<>(request, headers), PredixAuditResponse.class);

Assert.assertTrue(response.getBody().getContent().size() >= 1);
}

Expand Down