diff --git a/storage-core/pom.xml b/storage-core/pom.xml
index 7fc26f1a56dfc40c0f4953fb1673c342acf01dc8..ab1fd04a556821fb02b0f629bdbdb93b11bb3df3 100644
--- a/storage-core/pom.xml
+++ b/storage-core/pom.xml
@@ -122,7 +122,6 @@
<version>2.22.2</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/storage-core/src/test/java/org/opengroup/osdu/storage/api/PatchApiControllerTest.java b/storage-core/src/test/java/org/opengroup/osdu/storage/api/PatchApiControllerTest.java
index 6f2f16ad8cd406ecd10a9c4ac46a41dc6fbbdd14..7dc783e2bc54850882d163b85e43b6b7a03674e7 100644
--- a/storage-core/src/test/java/org/opengroup/osdu/storage/api/PatchApiControllerTest.java
+++ b/storage-core/src/test/java/org/opengroup/osdu/storage/api/PatchApiControllerTest.java
@@ -17,12 +17,11 @@ package org.opengroup.osdu.storage.api;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.fge.jsonpatch.JsonPatch;
import com.google.gson.Gson;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.opengroup.osdu.core.common.model.http.AppError;
import org.opengroup.osdu.core.common.model.storage.StorageRole;
import org.opengroup.osdu.storage.model.PatchRecordsRequestModel;
@@ -34,7 +33,6 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.http.HttpMethod;
import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.ResultActions;
import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
@@ -46,11 +44,11 @@ import java.util.Arrays;
import java.util.List;
import java.util.Optional;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
-@RunWith(SpringRunner.class)
+@ExtendWith(MockitoExtension.class)
@WebMvcTest(controllers = PatchApi.class)
@ComponentScan("org.opengroup.osdu")
public class PatchApiControllerTest extends ApiTest<PatchRecordsRequestModel> {
@@ -58,7 +56,7 @@ public class PatchApiControllerTest extends ApiTest<PatchRecordsRequestModel> {
private final ObjectMapper mapper = new ObjectMapper();
private Gson gson = new Gson();
- @Before
+ @BeforeEach
public void setup() {
Mockito.when(dpsHeaders.getUserEmail()).thenReturn("a@b");
Mockito.when(dpsHeaders.getPartitionId()).thenReturn("opendes");
@@ -73,9 +71,9 @@ public class PatchApiControllerTest extends ApiTest<PatchRecordsRequestModel> {
ResultActions result = sendRequest(getRequestPayload(getValidInputJson(), recordQueryPatch));
MockHttpServletResponse response = result.andExpect(MockMvcResultMatchers.status().isForbidden()).andReturn().getResponse();
AppError appError = gson.fromJson(response.getContentAsString(), AppError.class);
- Assert.assertEquals(403, appError.getCode());
- Assert.assertEquals("Access denied", appError.getReason());
- Assert.assertEquals("The user is not authorized to perform this action", appError.getMessage());
+ assertEquals(403, appError.getCode());
+ assertEquals("Access denied", appError.getReason());
+ assertEquals("The user is not authorized to perform this action", appError.getMessage());
}
@Test
@@ -85,9 +83,9 @@ public class PatchApiControllerTest extends ApiTest<PatchRecordsRequestModel> {
ResultActions result = sendRequest(getRequestPayload(getInValidInputJsonBadOp(), recordQueryPatch));
MockHttpServletResponse response = result.andExpect(MockMvcResultMatchers.status().isBadRequest()).andReturn().getResponse();
AppError appError = gson.fromJson(response.getContentAsString(), AppError.class);
- Assert.assertEquals(400, appError.getCode());
- Assert.assertEquals("Validation failed", appError.getReason());
- Assert.assertEquals(ValidationDoc.INVALID_PATCH_OPERATION, appError.getMessage());
+ assertEquals(400, appError.getCode());
+ assertEquals("Validation failed", appError.getReason());
+ assertEquals(ValidationDoc.INVALID_PATCH_OPERATION, appError.getMessage());
}
@Test
@@ -97,9 +95,9 @@ public class PatchApiControllerTest extends ApiTest<PatchRecordsRequestModel> {
ResultActions result = sendRequest(getRequestPayload(getInValidInputJsonBadPath(), recordQueryPatch));
MockHttpServletResponse response = result.andExpect(MockMvcResultMatchers.status().isBadRequest()).andReturn().getResponse();
AppError appError = gson.fromJson(response.getContentAsString(), AppError.class);
- Assert.assertEquals(400, appError.getCode());
- Assert.assertEquals("Validation failed", appError.getReason());
- Assert.assertEquals(ValidationDoc.INVALID_PATCH_PATH_START, appError.getMessage());
+ assertEquals(400, appError.getCode());
+ assertEquals("Validation failed", appError.getReason());
+ assertEquals(ValidationDoc.INVALID_PATCH_PATH_START, appError.getMessage());
}
@Test
@@ -109,9 +107,9 @@ public class PatchApiControllerTest extends ApiTest<PatchRecordsRequestModel> {
ResultActions result = sendRequest(getRequestPayload(getValidInputJson(), recordQueryPatch));
MockHttpServletResponse response = result.andExpect(MockMvcResultMatchers.status().isBadRequest()).andReturn().getResponse();
AppError appError = gson.fromJson(response.getContentAsString(), AppError.class);
- Assert.assertEquals(400, appError.getCode());
- Assert.assertEquals("Validation failed", appError.getReason());
- Assert.assertEquals(ValidationDoc.PATCH_RECORDS_MAX, appError.getMessage());
+ assertEquals(400, appError.getCode());
+ assertEquals("Validation failed", appError.getReason());
+ assertEquals(ValidationDoc.PATCH_RECORDS_MAX, appError.getMessage());
}
@Test
@@ -121,9 +119,9 @@ public class PatchApiControllerTest extends ApiTest<PatchRecordsRequestModel> {
ResultActions result = sendRequest(getRequestPayload(getValidInputJson(), recordQueryPatch));
MockHttpServletResponse response = result.andExpect(MockMvcResultMatchers.status().isBadRequest()).andReturn().getResponse();
AppError appError = gson.fromJson(response.getContentAsString(), AppError.class);
- Assert.assertEquals(400, appError.getCode());
- Assert.assertEquals("Validation failed", appError.getReason());
- Assert.assertEquals(ValidationDoc.RECORD_ID_LIST_NOT_EMPTY, appError.getMessage());
+ assertEquals(400, appError.getCode());
+ assertEquals("Validation failed", appError.getReason());
+ assertEquals(ValidationDoc.RECORD_ID_LIST_NOT_EMPTY, appError.getMessage());
}
@Test
@@ -133,9 +131,9 @@ public class PatchApiControllerTest extends ApiTest<PatchRecordsRequestModel> {
ResultActions result = sendRequest(getRequestPayload(getValidInputJson(), recordQueryPatch));
MockHttpServletResponse response = result.andExpect(MockMvcResultMatchers.status().isBadRequest()).andReturn().getResponse();
AppError appError = gson.fromJson(response.getContentAsString(), AppError.class);
- Assert.assertEquals(400, appError.getCode());
- Assert.assertEquals("Validation failed", appError.getReason());
- Assert.assertEquals(ValidationDoc.RECORD_ID_LIST_NOT_EMPTY, appError.getMessage());
+ assertEquals(400, appError.getCode());
+ assertEquals("Validation failed", appError.getReason());
+ assertEquals(ValidationDoc.RECORD_ID_LIST_NOT_EMPTY, appError.getMessage());
}
@Test
diff --git a/storage-core/src/test/java/org/opengroup/osdu/storage/api/SchemaApiTest.java b/storage-core/src/test/java/org/opengroup/osdu/storage/api/SchemaApiTest.java
index 485645b750cbc0f7894d44e85a0a792b232d966f..bf42126932d7779e0e4f89a8603c5341b16d1de3 100644
--- a/storage-core/src/test/java/org/opengroup/osdu/storage/api/SchemaApiTest.java
+++ b/storage-core/src/test/java/org/opengroup/osdu/storage/api/SchemaApiTest.java
@@ -14,22 +14,22 @@
package org.opengroup.osdu.storage.api;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks;
import java.lang.reflect.Method;
import org.apache.http.HttpStatus;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.opengroup.osdu.core.common.model.http.AppException;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
@@ -41,7 +41,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
-@RunWith(MockitoJUnitRunner.Silent.class)
+@ExtendWith(MockitoExtension.class)
public class SchemaApiTest {
@Mock
@@ -56,7 +56,7 @@ public class SchemaApiTest {
@InjectMocks
private SchemaApi sut;
- @Before
+ @BeforeEach
public void setup() {
initMocks(this);
}
diff --git a/storage-core/src/test/java/org/opengroup/osdu/storage/conversion/ConversionServiceTest.java b/storage-core/src/test/java/org/opengroup/osdu/storage/conversion/ConversionServiceTest.java
index 1ed341726ed5248a0d0e20e9c38d4ddf4c165e06..1910415187c9466f0228d2530ddb3633c21354bb 100644
--- a/storage-core/src/test/java/org/opengroup/osdu/storage/conversion/ConversionServiceTest.java
+++ b/storage-core/src/test/java/org/opengroup/osdu/storage/conversion/ConversionServiceTest.java
@@ -18,12 +18,12 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.opengroup.osdu.core.common.crs.CrsConversionServiceErrorMessages;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.crs.ConvertStatus;
@@ -33,14 +33,14 @@ import org.opengroup.osdu.core.common.model.storage.ConversionStatus;
import java.util.ArrayList;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.opengroup.osdu.storage.conversion.CrsConversionServiceErrorMessages.UNEXPECTED_DATA_FORMAT_JSON_OBJECT;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class ConversionServiceTest {
@Mock
@@ -500,7 +500,7 @@ public class ConversionServiceTest {
assertEquals(2, result.getRecords().size());
result.getRecords().stream().map(r -> pointRecordId.equalsIgnoreCase(r.get("id").getAsString())
? r.toString().equalsIgnoreCase(ANY_CRS_POINT_CONVERTED_RECORD)
- : r.toString().equalsIgnoreCase(ANY_CRS_POLYGON_CONVERTED_RECORD)).forEach(Assert::assertTrue);
+ : r.toString().equalsIgnoreCase(ANY_CRS_POLYGON_CONVERTED_RECORD)).forEach(Assertions::assertTrue);
}
@Test
diff --git a/storage-core/src/test/java/org/opengroup/osdu/storage/model/TransferInfoTest.java b/storage-core/src/test/java/org/opengroup/osdu/storage/model/TransferInfoTest.java
index 117791ba0a58ecf337027ce4d200e1389748a733..c850006754b48b41bcb3b9a7f36ffab671dd9e78 100644
--- a/storage-core/src/test/java/org/opengroup/osdu/storage/model/TransferInfoTest.java
+++ b/storage-core/src/test/java/org/opengroup/osdu/storage/model/TransferInfoTest.java
@@ -14,10 +14,10 @@
package org.opengroup.osdu.storage.model;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.opengroup.osdu.core.common.model.storage.TransferInfo;
public class TransferInfoTest {
@@ -28,7 +28,7 @@ public class TransferInfoTest {
TransferInfo sut = new TransferInfo("testUser", 10);
assertEquals("testUser", sut.getUser());
- assertEquals(new Integer(10), sut.getRecordCount());
+ assertEquals(10, sut.getRecordCount());
assertTrue(sut.getVersion() > 0);
}
@@ -37,7 +37,7 @@ public class TransferInfoTest {
TransferInfo sut = new TransferInfo("anyone", 10);
assertEquals("anyone", sut.getUser());
- assertEquals(new Integer(10), sut.getRecordCount());
+ assertEquals(10, sut.getRecordCount());
assertTrue(sut.getVersion() > 0);
}
-}
\ No newline at end of file
+}
diff --git a/storage-core/src/test/java/org/opengroup/osdu/storage/persistence/PersistenceHelperTest.java b/storage-core/src/test/java/org/opengroup/osdu/storage/persistence/PersistenceHelperTest.java
index 61c36abf2ed2bba4c2749797831fb11b7e0ab7e8..15fc2b344093b6afa82c5ac3412c900078edfde3 100644
--- a/storage-core/src/test/java/org/opengroup/osdu/storage/persistence/PersistenceHelperTest.java
+++ b/storage-core/src/test/java/org/opengroup/osdu/storage/persistence/PersistenceHelperTest.java
@@ -14,16 +14,16 @@
package org.opengroup.osdu.storage.persistence;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.google.common.collect.Sets;
import com.google.gson.Gson;
diff --git a/storage-core/src/test/java/org/opengroup/osdu/storage/service/BulkUpdateRecordServiceImplTest.java b/storage-core/src/test/java/org/opengroup/osdu/storage/service/BulkUpdateRecordServiceImplTest.java
index 8c84a22f935df9f776a59f91baaf185abd9d7de8..56e515d24db4ffbcd34d00ee8775a33b9a782914 100644
--- a/storage-core/src/test/java/org/opengroup/osdu/storage/service/BulkUpdateRecordServiceImplTest.java
+++ b/storage-core/src/test/java/org/opengroup/osdu/storage/service/BulkUpdateRecordServiceImplTest.java
@@ -14,11 +14,12 @@
package org.opengroup.osdu.storage.service;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.entitlements.Acl;
import org.opengroup.osdu.core.common.model.http.CollaborationContext;
@@ -43,13 +44,13 @@ import java.util.*;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.*;
-@RunWith(MockitoJUnitRunner.Silent.class)
+@ExtendWith(MockitoExtension.class)
public class BulkUpdateRecordServiceImplTest {
private static final String PATCH_OPERATION = "replace";
diff --git a/storage-core/src/test/java/org/opengroup/osdu/storage/service/RecordServiceImplTest.java b/storage-core/src/test/java/org/opengroup/osdu/storage/service/RecordServiceImplTest.java
index 1326092d9a8f552e9efea18f6a38e512ae30f532..3ae350c3f145fb1e3d8c6244f50e4977aee1b038 100644
--- a/storage-core/src/test/java/org/opengroup/osdu/storage/service/RecordServiceImplTest.java
+++ b/storage-core/src/test/java/org/opengroup/osdu/storage/service/RecordServiceImplTest.java
@@ -16,13 +16,14 @@ package org.opengroup.osdu.storage.service;
import com.google.common.collect.Lists;
import org.apache.http.HttpStatus;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.opengroup.osdu.core.common.entitlements.IEntitlementsAndCacheService;
import org.opengroup.osdu.core.common.feature.IFeatureFlag;
import org.opengroup.osdu.core.common.model.entitlements.Acl;
@@ -49,12 +50,12 @@ import java.util.*;
import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.*;
-@RunWith(MockitoJUnitRunner.Silent.class)
+@ExtendWith(MockitoExtension.class)
public class RecordServiceImplTest {
private static final String RECORD_ID = "tenant1:record:anyId";
@@ -102,7 +103,7 @@ public class RecordServiceImplTest {
@Mock
private IFeatureFlag collaborationFeatureFlag;
- @Before
+ @BeforeEach
public void setup() {
mock(PersistenceHelper.class);
diff --git a/storage-core/src/test/java/org/opengroup/osdu/storage/util/CollaborationUtilTest.java b/storage-core/src/test/java/org/opengroup/osdu/storage/util/CollaborationUtilTest.java
index ac34345089a710d857e8e02359baab5878dd1841..c932155be53f511871d44975ee0e999280edc11b 100644
--- a/storage-core/src/test/java/org/opengroup/osdu/storage/util/CollaborationUtilTest.java
+++ b/storage-core/src/test/java/org/opengroup/osdu/storage/util/CollaborationUtilTest.java
@@ -1,17 +1,18 @@
package org.opengroup.osdu.storage.util;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.opengroup.osdu.core.common.model.http.CollaborationContext;
import java.util.Optional;
import java.util.UUID;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class CollaborationUtilTest {
private final static String RECORD_ID = "opendes:id:15706318658560";
diff --git a/storage-core/src/test/java/org/opengroup/osdu/storage/util/GlobalOtherExceptionMapperTest.java b/storage-core/src/test/java/org/opengroup/osdu/storage/util/GlobalOtherExceptionMapperTest.java
index 6e540972e0c72ec9659cfe61c1c4b8c781b40e48..92558e2a8db8d19c56f4426f4c5cffe8af613a0d 100644
--- a/storage-core/src/test/java/org/opengroup/osdu/storage/util/GlobalOtherExceptionMapperTest.java
+++ b/storage-core/src/test/java/org/opengroup/osdu/storage/util/GlobalOtherExceptionMapperTest.java
@@ -1,21 +1,21 @@
package org.opengroup.osdu.storage.util;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.opengroup.osdu.core.common.model.http.AppError;
import org.opengroup.osdu.core.common.model.http.AppException;
import org.springframework.http.ResponseEntity;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class GlobalOtherExceptionMapperTest {
@InjectMocks
diff --git a/storage-core/src/test/java/org/opengroup/osdu/storage/util/JsonPatchUtilTest.java b/storage-core/src/test/java/org/opengroup/osdu/storage/util/JsonPatchUtilTest.java
index ef92ab582749f1426c489ad0ef36b2cd5636a0e5..c47d25feb3f26bcc86d9664ca374767476dc2283 100644
--- a/storage-core/src/test/java/org/opengroup/osdu/storage/util/JsonPatchUtilTest.java
+++ b/storage-core/src/test/java/org/opengroup/osdu/storage/util/JsonPatchUtilTest.java
@@ -16,10 +16,11 @@ package org.opengroup.osdu.storage.util;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.fge.jsonpatch.JsonPatch;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.opengroup.osdu.core.common.model.entitlements.Acl;
import org.opengroup.osdu.core.common.model.legal.Legal;
import org.opengroup.osdu.core.common.model.storage.Record;
@@ -32,7 +33,9 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-@RunWith(MockitoJUnitRunner.class)
+import static org.junit.jupiter.api.Assertions.*;
+
+@ExtendWith(MockitoExtension.class)
public class JsonPatchUtilTest {
private final ObjectMapper mapper = new ObjectMapper();
@@ -42,9 +45,9 @@ public class JsonPatchUtilTest {
Record record = getRecord();
JsonPatch jsonPatch = JsonPatch.fromJson(mapper.readTree("[{\"op\":\"add\", \"path\":\"/acl/viewers/-\", \"value\":\"viewer3\"}, {\"op\":\"add\", \"path\":\"/data\", \"value\":{\"Hello\" : \"world\"}}]"));
Record patchedRecord = JsonPatchUtil.applyPatch(jsonPatch, Record.class, record);
- Assert.assertTrue(Arrays.stream(patchedRecord.getAcl().getViewers()).anyMatch("viewer3"::equals));
+ assertTrue(Arrays.stream(patchedRecord.getAcl().getViewers()).anyMatch("viewer3"::equals));
patchedRecord.getData().containsKey("Hello");
- Assert.assertEquals("world", patchedRecord.getData().get("Hello"));
+ assertEquals("world", patchedRecord.getData().get("Hello"));
}
@Test
@@ -52,25 +55,25 @@ public class JsonPatchUtilTest {
RecordMetadata recordMetadata = getRecordMetadata();
JsonPatch jsonPatch = JsonPatch.fromJson(mapper.readTree("[{\"op\":\"add\", \"path\":\"/acl/viewers/-\", \"value\":\"viewer3\"}]"));
RecordMetadata patchedRecordMetadata = JsonPatchUtil.applyPatch(jsonPatch, RecordMetadata.class, recordMetadata);
- Assert.assertTrue(Arrays.stream(patchedRecordMetadata.getAcl().getViewers()).anyMatch("viewer3"::equals));
+ assertTrue(Arrays.stream(patchedRecordMetadata.getAcl().getViewers()).anyMatch("viewer3"::equals));
}
@Test
public void shouldReturnTrue_when_dataIsBeingPatched() throws Exception {
JsonPatch jsonPatch = JsonPatch.fromJson(mapper.readTree("[{\"op\":\"add\", \"path\":\"/acl/viewers/-\", \"value\":\"viewer3\"}, {\"op\":\"add\", \"path\":\"/data\", \"value\":{\"Hello\" : \"world\"}}]"));
- Assert.assertTrue(JsonPatchUtil.isDataOrMetaBeingUpdated(jsonPatch));
+ assertTrue(JsonPatchUtil.isDataOrMetaBeingUpdated(jsonPatch));
}
@Test
public void shouldReturnTrue_when_metaIsBeingPatched() throws Exception {
JsonPatch jsonPatch = JsonPatch.fromJson(mapper.readTree("[{\"op\":\"add\", \"path\":\"/acl/viewers/-\", \"value\":\"viewer3\"}, {\"op\":\"add\", \"path\":\"/meta\", \"value\":[{\"Hello\" : \"world\"}]}]"));
- Assert.assertTrue(JsonPatchUtil.isDataOrMetaBeingUpdated(jsonPatch));
+ assertTrue(JsonPatchUtil.isDataOrMetaBeingUpdated(jsonPatch));
}
@Test
public void shouldReturnFalse_when_neitherDataOrMetaIsBeingPatched() throws Exception {
JsonPatch jsonPatch = JsonPatch.fromJson(mapper.readTree("[{\"op\":\"add\", \"path\":\"/acl/viewers/-\", \"value\":\"viewer3\"}]"));
- Assert.assertFalse(JsonPatchUtil.isDataOrMetaBeingUpdated(jsonPatch));
+ assertFalse(JsonPatchUtil.isDataOrMetaBeingUpdated(jsonPatch));
}
@Test
@@ -80,83 +83,83 @@ public class JsonPatchUtilTest {
JsonPatch jsonPatchNewAcl = JsonPatch.fromJson(mapper.readTree("[{\"op\":\"add\", \"path\":\"/acl/viewers/-\", \"value\":\"viewer3\"}]"));
JsonPatch jsonPatchNewAndDuplicate = JsonPatch.fromJson(mapper.readTree("[{\"op\":\"add\", \"path\":\"/acl/viewers/-\", \"value\":\"viewer3\"}]"));
JsonPatch resultPatchEmpty = JsonPatchUtil.getJsonPatchForRecord(recordMetadata, jsonPatchDuplicateAcl);
- Assert.assertTrue(resultPatchEmpty.toString().equals("[]"));
+ assertTrue(resultPatchEmpty.toString().equals("[]"));
JsonPatch resultPatchSame = JsonPatchUtil.getJsonPatchForRecord(recordMetadata, jsonPatchNewAcl);
- Assert.assertEquals(jsonPatchNewAcl.toString(), resultPatchSame.toString());
+ assertEquals(jsonPatchNewAcl.toString(), resultPatchSame.toString());
JsonPatch resultPatchRemovedDuplicate = JsonPatchUtil.getJsonPatchForRecord(recordMetadata, jsonPatchNewAndDuplicate);
- Assert.assertEquals(resultPatchRemovedDuplicate.toString(), jsonPatchNewAcl.toString());
+ assertEquals(resultPatchRemovedDuplicate.toString(), jsonPatchNewAcl.toString());
}
@Test
public void shouldReturnTrue_when_emptyViewersAclRecordMetadata() {
RecordMetadata recordMetadata = getRecordMetadata();
recordMetadata.getAcl().setViewers(new String[0]);
- Assert.assertTrue(JsonPatchUtil.isEmptyAclOrLegal(recordMetadata));
+ assertTrue(JsonPatchUtil.isEmptyAclOrLegal(recordMetadata));
}
@Test
public void shouldReturnTrue_when_emptyOwnersAclRecordMetadata() {
RecordMetadata recordMetadata = getRecordMetadata();
recordMetadata.getAcl().setOwners(new String[0]);
- Assert.assertTrue(JsonPatchUtil.isEmptyAclOrLegal(recordMetadata));
+ assertTrue(JsonPatchUtil.isEmptyAclOrLegal(recordMetadata));
}
@Test
public void shouldReturnTrue_when_emptyLegalRecordMetadata() {
RecordMetadata recordMetadata = getRecordMetadata();
recordMetadata.getLegal().setLegaltags(new HashSet<>());
- Assert.assertTrue(JsonPatchUtil.isEmptyAclOrLegal(recordMetadata));
+ assertTrue(JsonPatchUtil.isEmptyAclOrLegal(recordMetadata));
}
@Test
public void shouldReturnFalse_when_nonEmptyAclAndLegalRecordMetadata() {
RecordMetadata recordMetadata = getRecordMetadata();
- Assert.assertFalse(JsonPatchUtil.isEmptyAclOrLegal(recordMetadata));
+ assertFalse(JsonPatchUtil.isEmptyAclOrLegal(recordMetadata));
}
@Test
public void shouldReturnTrue_when_emptyViewersAclRecord() {
Record record = getRecord();
record.getAcl().setViewers(new String[0]);
- Assert.assertTrue(JsonPatchUtil.isEmptyAclOrLegal(record));
+ assertTrue(JsonPatchUtil.isEmptyAclOrLegal(record));
}
@Test
public void shouldReturnTrue_when_emptyOwnersAclRecord() {
Record record = getRecord();
record.getAcl().setOwners(new String[0]);
- Assert.assertTrue(JsonPatchUtil.isEmptyAclOrLegal(record));
+ assertTrue(JsonPatchUtil.isEmptyAclOrLegal(record));
}
@Test
public void shouldReturnTrue_when_emptyLegalRecord() {
Record record = getRecord();
record.getLegal().setLegaltags(new HashSet<>());
- Assert.assertTrue(JsonPatchUtil.isEmptyAclOrLegal(record));
+ assertTrue(JsonPatchUtil.isEmptyAclOrLegal(record));
}
@Test
public void shouldReturnFalse_when_nonEmptyAclAndLegalRecord() {
Record record = getRecord();
- Assert.assertFalse(JsonPatchUtil.isEmptyAclOrLegal(record));
+ assertFalse(JsonPatchUtil.isEmptyAclOrLegal(record));
}
@Test
public void shouldReturnTrue_when_kindIsUpdated() throws Exception {
JsonPatch jsonPatch = JsonPatch.fromJson(mapper.readTree("[{\"op\":\"add\", \"path\":\"/acl/viewers/-\", \"value\":\"viewer3\"}, {\"op\":\"replace\", \"path\":\"/kind\", \"value\":\"newKind\"}]"));
- Assert.assertTrue(JsonPatchUtil.isKindBeingUpdated(jsonPatch));
+ assertTrue(JsonPatchUtil.isKindBeingUpdated(jsonPatch));
}
@Test
public void shouldReturnFalse_when_kindIsNotUpdated() throws Exception {
JsonPatch jsonPatch = JsonPatch.fromJson(mapper.readTree("[{\"op\":\"add\", \"path\":\"/acl/viewers/-\", \"value\":\"viewer3\"}, {\"op\":\"add\", \"path\":\"/data\", \"value\":{\"Hello\" : \"world\"}}]"));
- Assert.assertFalse(JsonPatchUtil.isKindBeingUpdated(jsonPatch));
+ assertFalse(JsonPatchUtil.isKindBeingUpdated(jsonPatch));
}
@Test
public void shouldReturnKindFromJsonPatch() throws Exception {
JsonPatch jsonPatch = JsonPatch.fromJson(mapper.readTree("[{\"op\":\"add\", \"path\":\"/acl/viewers/-\", \"value\":\"viewer3\"}, {\"op\":\"replace\", \"path\":\"/kind\", \"value\":\"newKind\"}]"));
- Assert.assertEquals("newKind", JsonPatchUtil.getNewKindFromPatchInput(jsonPatch));
+ assertEquals("newKind", JsonPatchUtil.getNewKindFromPatchInput(jsonPatch));
}
private Record getRecord() {