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 dd143a3cf1d05aa37eab1095e77d1c9349362e39..29ef5ced9cc90b4c0a3d37cd96219a1b52b9b6c8 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 4250d90719e56f510e8ba6171cd696db095a4b5d..5439cda73102dd2b1fc89b0878808b2df9fdaa4b 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 5446f36e8e4d867155e0030ddeaffdf611a12d93..86dc555d6d81709cf02b7817e0cde04e7dcca462 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 940e5bc0f1ee8aca24051fefc205e40489edeafc..ea0c03449f8edbe5f3bc71ea786930a0e7a7c6f4 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 35aec46a000c8e3b9ccd2a02384c20d9e463286a..24b7964aaf6d01d2614e7debbfa992eb4ec314ae 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()); + } }