From 54fcf41db2e965f1769f449409219940446a8c2b Mon Sep 17 00:00:00 2001
From: Pavel Bachyla <pbachyla@slb.com>
Date: Mon, 30 Nov 2020 16:43:21 +0300
Subject: [PATCH] Replace tenant1 to opendes in recordId
---
.../osdu/step_definitions/index/record/Steps.java | 6 ++++++
.../main/java/org/opengroup/osdu/common/RecordSteps.java | 8 +++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/record/Steps.java b/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/record/Steps.java
index 7b1c280c6..4b4a9dc5f 100644
--- a/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/record/Steps.java
+++ b/testing/indexer-test-aws/src/test/java/org/opengroup/osdu/step_definitions/index/record/Steps.java
@@ -29,6 +29,7 @@ import org.opengroup.osdu.util.ElasticUtilsAws;
import org.opengroup.osdu.util.LegalTagUtilsAws;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
import static org.opengroup.osdu.util.Config.getLegalTag;
@@ -71,6 +72,11 @@ public class Steps extends RecordSteps {
return legal;
}
+ protected String generateRecordId(Map<String, Object> testRecord) {
+ String tenant = testRecord.get("id").toString().replaceFirst("tenant1", "opendes");
+ return generateActualName(tenant, super.getTimeStamp());
+ }
+
@Given("^the schema is created with the following kind$")
public void the_schema_is_created_with_the_following_kind(DataTable dataTable){
super.the_schema_is_created_with_the_following_kind(dataTable);
diff --git a/testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/RecordSteps.java b/testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/RecordSteps.java
index 12d4437de..7d524e5b4 100644
--- a/testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/RecordSteps.java
+++ b/testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/RecordSteps.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.logging.Level;
import static org.junit.Assert.*;
import static org.opengroup.osdu.util.Config.getEntitlementsDomain;
@@ -92,7 +93,7 @@ public class RecordSteps extends TestsBase {
records = new Gson().fromJson(fileContent, new TypeToken<List<Map<String, Object>>>() {}.getType());
for (Map<String, Object> testRecord : records) {
- testRecord.put("id", generateActualName(testRecord.get("id").toString(), timeStamp));
+ testRecord.put("id", generateRecordId(testRecord));
testRecord.put("kind", actualKind);
testRecord.put("legal", generateLegalTag());
String[] x_acl = {generateActualName(dataGroup,timeStamp)+"."+getEntitlementsDomain()};
@@ -100,6 +101,7 @@ public class RecordSteps extends TestsBase {
testRecord.put("acl", acl);
}
String payLoad = new Gson().toJson(records);
+ log.log(Level.INFO, "Start ingesting records={0}", payLoad);
ClientResponse clientResponse = httpClient.send(HttpMethod.PUT, getStorageBaseURL() + "records", payLoad, headers, httpClient.getAccessToken());
assertEquals(201, clientResponse.getStatus());
} catch (Exception ex) {
@@ -107,6 +109,10 @@ public class RecordSteps extends TestsBase {
}
}
+ protected String generateRecordId(Map<String, Object> testRecord) {
+ return generateActualName(testRecord.get("id").toString(), timeStamp);
+ }
+
public void i_should_get_the_documents_for_the_in_the_Elastic_Search(int expectedCount, String index) throws Throwable {
index = generateActualName(index, timeStamp);
long numOfIndexedDocuments = createIndex(index);
--
GitLab