From 75fe7f0b124a6dedcc3e7e52c90f2db8134c241b Mon Sep 17 00:00:00 2001
From: Anastasiia_Gelmut <anastasiia_gelmut@epam.com>
Date: Thu, 7 Oct 2021 14:15:50 +0400
Subject: [PATCH] GONRG-3532 Integration Test Implement Clean-up for Datastore

---
 .../osdu/partition/api/TestCreatePartition.java      |  7 +++++--
 .../osdu/partition/api/TestDeletePartition.java      |  1 +
 .../osdu/partition/api/TestGetPartitionById.java     | 10 ++++++++++
 .../osdu/partition/api/TestListPartitions.java       | 10 ++++++++++
 .../osdu/partition/api/TestUpdatePartition.java      | 12 +++++++++++-
 5 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestCreatePartition.java b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestCreatePartition.java
index dd143a3cf..29ef5ced9 100644
--- a/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestCreatePartition.java
+++ b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestCreatePartition.java
@@ -36,14 +36,17 @@ public class TestCreatePartition extends CreatePartitionTest {
   @Override
   @After
   public void tearDown() throws Exception {
+    deleteResource();
     this.testUtils = null;
   }
 
   @Override
   @Test
-  public void should_return40XResponseCode_when_makingRequest_withInvalidPayload() throws Exception {
+  public void should_return40XResponseCode_when_makingRequest_withInvalidPayload()
+      throws Exception {
     String invalidPayload = "{\"properties_invalid\":{}}";
-    ClientResponse response = descriptor.runWithCustomPayload(getId(), invalidPayload, testUtils.getAccessToken());
+    ClientResponse response = descriptor.runWithCustomPayload(getId(), invalidPayload,
+        testUtils.getAccessToken());
     assertEquals(400, response.getStatus());
   }
 }
diff --git a/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestDeletePartition.java b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestDeletePartition.java
index 4250d9071..5439cda73 100644
--- a/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestDeletePartition.java
+++ b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestDeletePartition.java
@@ -32,6 +32,7 @@ public class TestDeletePartition extends DeletePartitionTest {
   @Override
   @After
   public void tearDown() throws Exception {
+    deleteResource();
     this.testUtils = null;
   }
 }
diff --git a/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestGetPartitionById.java b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestGetPartitionById.java
index 5446f36e8..86dc555d6 100644
--- a/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestGetPartitionById.java
+++ b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestGetPartitionById.java
@@ -17,8 +17,10 @@
 
 package org.opengroup.osdu.partition.api;
 
+import com.sun.jersey.api.client.ClientResponse;
 import org.junit.After;
 import org.junit.Before;
+import org.opengroup.osdu.partition.api.descriptor.DeletePartitionDescriptor;
 import org.opengroup.osdu.partition.util.GCPTestUtils;
 
 public class TestGetPartitionById extends GetPartitionByIdApitTest {
@@ -32,6 +34,14 @@ public class TestGetPartitionById extends GetPartitionByIdApitTest {
   @Override
   @After
   public void tearDown() throws Exception {
+    deleteResource();
     this.testUtils = null;
   }
+
+  @Override
+  protected void deleteResource() throws Exception {
+    DeletePartitionDescriptor deletePartitionDes = new DeletePartitionDescriptor();
+    deletePartitionDes.setPartitionId(getId());
+    ClientResponse response = deletePartitionDes.run(getId(), this.testUtils.getAccessToken());
+  }
 }
diff --git a/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestListPartitions.java b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestListPartitions.java
index 940e5bc0f..ea0c03449 100644
--- a/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestListPartitions.java
+++ b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestListPartitions.java
@@ -17,8 +17,10 @@
 
 package org.opengroup.osdu.partition.api;
 
+import com.sun.jersey.api.client.ClientResponse;
 import org.junit.After;
 import org.junit.Before;
+import org.opengroup.osdu.partition.api.descriptor.DeletePartitionDescriptor;
 import org.opengroup.osdu.partition.util.GCPTestUtils;
 
 public class TestListPartitions extends ListPartitionsApitTest {
@@ -32,6 +34,14 @@ public class TestListPartitions extends ListPartitionsApitTest {
   @Override
   @After
   public void tearDown() throws Exception {
+    deleteResource();
     this.testUtils = null;
   }
+
+  @Override
+  protected void deleteResource() throws Exception {
+    DeletePartitionDescriptor deletePartitionDes = new DeletePartitionDescriptor();
+    deletePartitionDes.setPartitionId(getId());
+    ClientResponse response = deletePartitionDes.run(getId(), this.testUtils.getAccessToken());
+  }
 }
diff --git a/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestUpdatePartition.java b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestUpdatePartition.java
index 35aec46a0..24b7964aa 100644
--- a/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestUpdatePartition.java
+++ b/testing/partition-test-gcp/src/test/java/org/opengroup/osdu/partition/api/TestUpdatePartition.java
@@ -17,8 +17,10 @@
 
 package org.opengroup.osdu.partition.api;
 
+import com.sun.jersey.api.client.ClientResponse;
 import org.junit.After;
 import org.junit.Before;
+import org.opengroup.osdu.partition.api.descriptor.DeletePartitionDescriptor;
 import org.opengroup.osdu.partition.util.GCPTestUtils;
 
 public class TestUpdatePartition extends UpdatePartitionTest {
@@ -31,7 +33,15 @@ public class TestUpdatePartition extends UpdatePartitionTest {
 
   @Override
   @After
-  public void tearDown() {
+  public void tearDown() throws Exception {
+    deleteResource();
     this.testUtils = null;
   }
+
+  @Override
+  protected void deleteResource() throws Exception {
+    DeletePartitionDescriptor deletePartitionDes = new DeletePartitionDescriptor();
+    deletePartitionDes.setPartitionId(getId());
+    ClientResponse response = deletePartitionDes.run(getId(), this.testUtils.getAccessToken());
+  }
 }
-- 
GitLab