From 290822fd4386e4bdc16f7af8ca679f706ac3e750 Mon Sep 17 00:00:00 2001
From: Vinay Kumar Yadav <VYadav9@slb.com>
Date: Wed, 22 Mar 2023 09:32:03 +0530
Subject: [PATCH] updated int test
---
.../records/RecordsApiAcceptanceTests.java | 33 ++++++++++---------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/testing/storage-test-core/src/main/java/org/opengroup/osdu/storage/records/RecordsApiAcceptanceTests.java b/testing/storage-test-core/src/main/java/org/opengroup/osdu/storage/records/RecordsApiAcceptanceTests.java
index 279917f59..b0ac601ff 100644
--- a/testing/storage-test-core/src/main/java/org/opengroup/osdu/storage/records/RecordsApiAcceptanceTests.java
+++ b/testing/storage-test-core/src/main/java/org/opengroup/osdu/storage/records/RecordsApiAcceptanceTests.java
@@ -41,8 +41,7 @@ public abstract class RecordsApiAcceptanceTests extends TestBase {
protected static final String RECORD_ID = TenantUtils.getTenantName() + ":inttest:" + System.currentTimeMillis();
protected static final String RECORD_NEW_ID = TenantUtils.getTenantName() + ":inttest:"
+ System.currentTimeMillis();
- protected static final String RECORD_NEW_ID_1 = TenantUtils.getTenantName() + ":inttest:"
- + System.currentTimeMillis();
+
protected static final String KIND = TenantUtils.getTenantName() + ":ds:inttest:1.0."
+ System.currentTimeMillis();
protected static final String KIND_WITH_OTHER_TENANT = "tenant1" + ":ds:inttest:1.0."
@@ -62,7 +61,6 @@ public abstract class RecordsApiAcceptanceTests extends TestBase {
// are in
TestUtils.send("records/" + RECORD_ID, "DELETE", HeaderUtils.getHeaders(TenantUtils.getTenantName(), token), "", "");
TestUtils.send("records/" + RECORD_NEW_ID, "DELETE", HeaderUtils.getHeaders(TenantUtils.getTenantName(), token), "", "");
- TestUtils.send("records/" + RECORD_NEW_ID_1, "DELETE", HeaderUtils.getHeaders(TenantUtils.getTenantName(), token), "", "");
LegalTagUtils.delete(LEGAL_TAG, token);
}
@@ -316,9 +314,11 @@ public abstract class RecordsApiAcceptanceTests extends TestBase {
@Test
public void should_updateModifyTimeWithRecordUpdate() throws Exception {
+ final long currentTimeMillis = System.currentTimeMillis();
+ final String RECORD_ID = TenantUtils.getTenantName() + ":inttest:testModifyTimeUser-" + currentTimeMillis;
- String jsonInput = createJsonBody(RECORD_NEW_ID_1, "tianNew");
- System.out.println("RECORD_NEW_ID_1::::::"+RECORD_NEW_ID_1);
+ String jsonInput = createJsonBody(RECORD_ID, "tianNew");
+ System.out.println("RECORD_ID::::::"+RECORD_ID);
ClientResponse response = TestUtils.send("records", "PUT", HeaderUtils.getHeaders(TenantUtils.getTenantName(), testUtils.getToken()), jsonInput, "?skipdupes=false");
DummyRecordsHelper.CreateRecordResponse result = TestUtils.getResult(response, 201,
@@ -328,13 +328,13 @@ public abstract class RecordsApiAcceptanceTests extends TestBase {
assertEquals(1, result.recordIds.length);
assertEquals(1, result.recordIdVersions.length);
assertEquals(0, result.skippedRecordIds.length);
- assertEquals(RECORD_NEW_ID_1, result.recordIds[0]);
- System.out.println("RECORD_NEW_ID_1::::::"+RECORD_NEW_ID_1);
+ assertEquals(RECORD_ID, result.recordIds[0]);
+ System.out.println("RECORD_ID::::::"+RECORD_ID);
System.out.println("result recordIds::::::"+result.recordIds[0]);
String firstVersionNumber = StringUtils.substringAfterLast(result.recordIdVersions[0],":");
System.out.println("first version number::::::"+firstVersionNumber);
- response = TestUtils.send("records/" + RECORD_NEW_ID_1, "GET", HeaderUtils.getHeaders(TenantUtils.getTenantName(), testUtils.getToken()), "", "");
+ response = TestUtils.send("records/" + RECORD_ID, "GET", HeaderUtils.getHeaders(TenantUtils.getTenantName(), testUtils.getToken()), "", "");
GetRecordResponse recordResult1 = TestUtils.getResult(response, 200, GetRecordResponse.class);
//No modify user and time in 1st version of record
@@ -350,7 +350,7 @@ public abstract class RecordsApiAcceptanceTests extends TestBase {
assertEquals(1, result2.recordIds.length);
assertEquals(1, result2.recordIdVersions.length);
assertEquals(0, result2.skippedRecordIds.length);
- assertEquals(RECORD_NEW_ID_1, result2.recordIds[0]);
+ assertEquals(RECORD_ID, result2.recordIds[0]);
String secondVersionNumber = StringUtils.substringAfterLast(result2.recordIdVersions[0],":");
System.out.println("second version number::::::"+secondVersionNumber);
@@ -362,28 +362,31 @@ public abstract class RecordsApiAcceptanceTests extends TestBase {
assertEquals(1, result3.recordIds.length);
assertEquals(1, result3.recordIdVersions.length);
assertEquals(0, result3.skippedRecordIds.length);
- assertEquals(RECORD_NEW_ID_1, result3.recordIds[0]);
+ assertEquals(RECORD_ID, result3.recordIds[0]);
String thirdLastVersionNumber = StringUtils.substringAfterLast(result3.recordIdVersions[0],":");
System.out.println("third version number::::::"+thirdLastVersionNumber);
- System.out.println("Before 1st get call RECORD_NEW_ID_1::::::"+RECORD_NEW_ID_1);
- System.out.println("Before 1st get call path::::::"+"records/" + RECORD_NEW_ID_1+"/"+firstVersionNumber);
- response = TestUtils.send("records/" + RECORD_NEW_ID_1+"/"+firstVersionNumber, "GET", HeaderUtils.getHeaders(TenantUtils.getTenantName(), testUtils.getToken()), "", "");
+ System.out.println("Before 1st get call RECORD_NEW_ID_1::::::"+RECORD_ID);
+ System.out.println("Before 1st get call path::::::"+"records/" + RECORD_ID+"/"+firstVersionNumber);
+ response = TestUtils.send("records/" + RECORD_ID+"/"+firstVersionNumber, "GET", HeaderUtils.getHeaders(TenantUtils.getTenantName(), testUtils.getToken()), "", "");
GetRecordResponse recordResult2 = TestUtils.getResult(response, 200, GetRecordResponse.class);
//No modify user and time in 1st version of record
assertNull(recordResult2.modifyTime);
assertNull(recordResult2.modifyUser);
- response = TestUtils.send("records/" + RECORD_NEW_ID_1+"/"+secondVersionNumber, "GET", HeaderUtils.getHeaders(TenantUtils.getTenantName(), testUtils.getToken()), "", "");
+ response = TestUtils.send("records/" + RECORD_ID+"/"+secondVersionNumber, "GET", HeaderUtils.getHeaders(TenantUtils.getTenantName(), testUtils.getToken()), "", "");
GetRecordResponse recordResult3 = TestUtils.getResult(response, 200, GetRecordResponse.class);
- response = TestUtils.send("records/" + RECORD_NEW_ID_1+"/"+thirdLastVersionNumber, "GET", HeaderUtils.getHeaders(TenantUtils.getTenantName(), testUtils.getToken()), "", "");
+ response = TestUtils.send("records/" + RECORD_ID+"/"+thirdLastVersionNumber, "GET", HeaderUtils.getHeaders(TenantUtils.getTenantName(), testUtils.getToken()), "", "");
GetRecordResponse recordResult4 = TestUtils.getResult(response, 200, GetRecordResponse.class);
assertNotEquals(recordResult4.modifyTime, recordResult3.modifyTime);
+ response = TestUtils.send("records/" + RECORD_ID, "DELETE", HeaderUtils.getHeaders(TenantUtils.getTenantName(), testUtils.getToken()), "", "");
+ assertEquals(HttpStatus.SC_NO_CONTENT, response.getStatus());
+
}
protected static String createJsonBody(String id, String name) {
--
GitLab