Merge branch 'gcp-integration-test-implement-clean-up-at-datastore' into 'master'

Integration Test Implement Clean-up for Datastore (GONRG-3532)

See merge request !100

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());
   }
 }

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;
   }
 }

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());
+  }
 }

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());
+  }
 }

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());
+  }
 }