From 701997045694eb9f1b74270bd4696429d7b4b6e6 Mon Sep 17 00:00:00 2001
From: Michael Nguyen <michael.nguyen@parivedasolutions.com>
Date: Thu, 14 Nov 2019 18:02:41 -0600
Subject: [PATCH] reverted test changes.
---
.../main/java/org/opengroup/osdu/common/RecordSteps.java | 1 -
.../main/java/org/opengroup/osdu/common/TestsBase.java | 7 -------
.../src/main/resources/testData/records_1.json | 9 ---------
.../src/main/resources/testData/records_3.json | 9 ---------
4 files changed, 26 deletions(-)
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 4a52044c2..8725680bb 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
@@ -106,7 +106,6 @@ public class RecordSteps extends TestsBase {
String[] x_acl = {generateActualName(dataGroup,timeStamp)+"."+getEntitlementsDomain()};
Acl acl = Acl.builder().viewers(x_acl).owners(x_acl).build();
testRecord.put("acl", acl);
- testRecord.put("meta", generateMeta());
}
String payLoad = new Gson().toJson(records);
ClientResponse clientResponse = httpClient.send(HttpMethod.PUT, getStorageBaseURL() + "records", payLoad, headers, httpClient.getAccessToken());
diff --git a/testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/TestsBase.java b/testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/TestsBase.java
index fede15d87..6628d2984 100644
--- a/testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/TestsBase.java
+++ b/testing/indexer-test-core/src/main/java/org/opengroup/osdu/common/TestsBase.java
@@ -175,11 +175,4 @@ public abstract class TestsBase {
legal.setOtherRelevantDataCountries(otherRelevantCountries);
return legal;
}
-
- protected ArrayList<HashMap<String, Object>> generateMeta() {
- HashMap<String, Object> meta = new HashMap<String, Object>();
- ArrayList<HashMap<String,Object>> arrayMeta = new ArrayList<>();
- arrayMeta.add(meta);
- return arrayMeta;
- }
}
diff --git a/testing/indexer-test-core/src/main/resources/testData/records_1.json b/testing/indexer-test-core/src/main/resources/testData/records_1.json
index 06a17f171..14d4b3c84 100644
--- a/testing/indexer-test-core/src/main/resources/testData/records_1.json
+++ b/testing/indexer-test-core/src/main/resources/testData/records_1.json
@@ -17,9 +17,6 @@
],
"status": "compliant"
},
- "meta": [
- {}
- ],
"data": {
"Field": "OSDU OFFICE - 1",
"Location": "18.5204,73.8567",
@@ -58,9 +55,6 @@
],
"status": "compliant"
},
- "meta": [
- {}
- ],
"data": {
"Field": "OSDU OFFICE - 3",
"Location": "29.749655,-95.473476",
@@ -100,9 +94,6 @@
],
"status": "compliant"
},
- "meta": [
- {}
- ],
"data": {
"Field": "OSDU OFFICE - 4",
"Location": "29.6197,-95.6349",
diff --git a/testing/indexer-test-core/src/main/resources/testData/records_3.json b/testing/indexer-test-core/src/main/resources/testData/records_3.json
index a0e76a06c..a159d885c 100644
--- a/testing/indexer-test-core/src/main/resources/testData/records_3.json
+++ b/testing/indexer-test-core/src/main/resources/testData/records_3.json
@@ -17,9 +17,6 @@
],
"status": "compliant"
},
- "meta": [
- {}
- ],
"data": {
"Field": "OSDU OFFICE - 1",
"Location": "18.5204,73.8567",
@@ -59,9 +56,6 @@
],
"status": "compliant"
},
- "meta": [
- {}
- ],
"data": {
"Field": "OSDU OFFICE - 3",
"Location": "29.749655,-95.473476",
@@ -102,9 +96,6 @@
],
"status": "compliant"
},
- "meta": [
- {}
- ],
"data": {
"Field": "OSDU OFFICE - 4",
"Location": "29.6197,-95.6349",
--
GitLab