From b84ef03034f06b3e21a965d489ec4455d06b0869 Mon Sep 17 00:00:00 2001
From: Mingyang Zhu <mzhu9@slb.com>
Date: Thu, 6 May 2021 15:30:14 -0500
Subject: [PATCH] update NOTICE and fix the gcp int test failures
---
.../opengroup/osdu/partition/api/UpdatePartitionTest.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java
index f4a80e7c1..7a3125cdb 100644
--- a/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java
+++ b/testing/partition-test-core/src/main/java/org/opengroup/osdu/partition/api/UpdatePartitionTest.java
@@ -9,6 +9,7 @@ import org.opengroup.osdu.partition.util.BaseTestTemplate;
import org.springframework.http.HttpStatus;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
public abstract class UpdatePartitionTest extends BaseTestTemplate {
@@ -70,7 +71,9 @@ public abstract class UpdatePartitionTest extends BaseTestTemplate {
deleteResource();
assertEquals(response.getStatus(), HttpStatus.NO_CONTENT.value());
assertEquals("GET, POST, PUT, DELETE, OPTIONS, HEAD, PATCH", response.getHeaders().getFirst("Access-Control-Allow-Methods"));
- assertEquals("access-control-allow-origin, origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey", response.getHeaders().getFirst("Access-Control-Allow-Headers"));
+ assertEquals("origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey", response.getHeaders().getFirst("Access-Control-Allow-Headers"));
+ assertTrue("origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey".equals(response.getHeaders().getFirst("Access-Control-Allow-Headers")) ||
+ "access-control-allow-origin, origin, content-type, accept, authorization, data-partition-id, correlation-id, appkey".equals(response.getHeaders().getFirst("Access-Control-Allow-Headers")));
assertEquals("*", response.getHeaders().getFirst("Access-Control-Allow-Origin"));
assertEquals("true", response.getHeaders().getFirst("Access-Control-Allow-Credentials"));
assertEquals("default-src 'self'", response.getHeaders().getFirst("Content-Security-Policy"));
--
GitLab