restore from master

provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/ServiceAccountJwtGcpClientImplTest.java

@@ -102,7 +102,7 @@ public class ServiceAccountJwtGcpClientImplTest {
         when(Config.getGoogleAudiences()).thenReturn("aud");
 
 //        when(this.tenantInfoServiceProvider).thenReturn(this.tenantInfoService);
-
+        
         TenantInfo tenantInfo = new TenantInfo();
         tenantInfo.setServiceAccount("tenant");
 //        when(this.tenantInfoService.getTenantInfo()).thenReturn(tenantInfo);

provider/indexer-gcp/src/test/java/org/opengroup/osdu/indexer/util/TraceIdExtractorTest.java

-// Copyright 2017-2019, Schlumberger
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.opengroup.osdu.indexer.util;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opengroup.osdu.core.api.DpsHeaders;
-import org.opengroup.osdu.core.gcp.model.AppEngineHeaders;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static junit.framework.TestCase.assertTrue;
-
-@RunWith(SpringRunner.class)
-public class TraceIdExtractorTest {
-
-    @Test
-    public void should_getTraceableCloudContext_when_header_doesNot_contains_it() {
-        List<String> token = new ArrayList<>();
-        token.add("any token");
-        MultiValueMap<String, String> requestHeaders = new LinkedMultiValueMap<>();
-        requestHeaders.put(DpsHeaders.AUTHORIZATION, token);
-
-        String actual = TraceIdExtractor.getTraceableCloudContext(requestHeaders);
-
-        assertTrue(actual.matches(".*o=1"));
-    }
-
-    @Test
-    public void should_getTraceableCloudContext_when_header_contains_it() {
-        List<String> token = new ArrayList<>();
-        token.add("any token");
-        List<String> trace = new ArrayList<>();
-        trace.add("any trace");
-        MultiValueMap<String, String> requestHeaders = new LinkedMultiValueMap<>();
-        requestHeaders.put(DpsHeaders.AUTHORIZATION, token);
-        requestHeaders.put(AppEngineHeaders.CLOUD_TRACE_CONTEXT, trace);
-
-        String actual = TraceIdExtractor.getTraceableCloudContext(requestHeaders);
-        assertTrue(actual.matches("any trace/.*o=1"));
-
-        trace = new ArrayList<>();
-        trace.add("any/trace");
-        requestHeaders.put(AppEngineHeaders.CLOUD_TRACE_CONTEXT, trace);
-        actual = TraceIdExtractor.getTraceableCloudContext(requestHeaders);
-        assertTrue(actual.matches("any/trace;o=1"));
-
-        trace = new ArrayList<>();
-        trace.add("any/trace/test");
-        requestHeaders.put(AppEngineHeaders.CLOUD_TRACE_CONTEXT, trace);
-        actual = TraceIdExtractor.getTraceableCloudContext(requestHeaders);
-        assertTrue(actual.matches("any/trace;o=1"));
-    }
-
-}