From cc5db6e3ede38b6d1d282a5f23b7ea699e6b1ff5 Mon Sep 17 00:00:00 2001 From: iadgovuser58 <124906646+iadgovuser58@users.noreply.github.com> Date: Wed, 27 Mar 2024 16:37:44 -0400 Subject: [PATCH] put correct port back in application.properties; removed * from imports in IssuedCertificatesPageControllerTest --- .../src/main/resources/application.properties | 2 +- .../controllers/IssuedCertificatesPageControllerTest.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/HIRS_AttestationCAPortal/src/main/resources/application.properties b/HIRS_AttestationCAPortal/src/main/resources/application.properties index af89b948..1f574315 100644 --- a/HIRS_AttestationCAPortal/src/main/resources/application.properties +++ b/HIRS_AttestationCAPortal/src/main/resources/application.properties @@ -26,7 +26,7 @@ server.tomcat.accesslog.suffix=.log server.tomcat.accesslog.rotate=true # Tomcat TLS support -server.port=8449 +server.port=8443 server.ssl.enabled=true server.ssl.trust-store-type=JKS server.ssl.trust-store=/etc/hirs/certificates/HIRS/TrustStore.jks diff --git a/HIRS_AttestationCAPortal/src/test/java/hirs/attestationca/portal/page/controllers/IssuedCertificatesPageControllerTest.java b/HIRS_AttestationCAPortal/src/test/java/hirs/attestationca/portal/page/controllers/IssuedCertificatesPageControllerTest.java index 81cb727c..94f63add 100644 --- a/HIRS_AttestationCAPortal/src/test/java/hirs/attestationca/portal/page/controllers/IssuedCertificatesPageControllerTest.java +++ b/HIRS_AttestationCAPortal/src/test/java/hirs/attestationca/portal/page/controllers/IssuedCertificatesPageControllerTest.java @@ -21,7 +21,10 @@ import org.springframework.test.annotation.Rollback; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import static hirs.attestationca.portal.page.Page.ISSUED_CERTIFICATES; import static org.hamcrest.Matchers.hasSize; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; /** @@ -135,7 +138,7 @@ public class IssuedCertificatesPageControllerTest extends PageControllerTest { @Rollback public void getIssuedCertsList() throws Exception { -// // perform test + // perform test // getMockMvc().perform(MockMvcRequestBuilders.get(pagePath + "/list")) // .andExpect(status().isOk()) // .andExpect(jsonPath("$.data", hasSize(1)))