Skip to content
GitLab
Commit 070e1314 authored by Matt Wise's avatar Matt Wise
Browse files

remove commented out code

parent 6fd68996
Hide whitespace changes
Inline Side-by-side
dataset-registry-core/src/test/java/org/opengroup/osdu/datasetregistry/model/RecordTest.java deleted 100644 → 0
View file @ 6fd68996
// // Copyright 2017-2019, Schlumberger
// //
// // Licensed under the Apache License, Version 2.0 (the "License");
// // you may not use this file except in compliance with the License.
// // You may obtain a copy of the License at
// //
// // http://www.apache.org/licenses/LICENSE-2.0
// //
// // Unless required by applicable law or agreed to in writing, software
// // distributed under the License is distributed on an "AS IS" BASIS,
// // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// // See the License for the specific language governing permissions and
// // limitations under the License.
// package org.opengroup.osdu.storage.model;
// import static junit.framework.TestCase.assertEquals;
// import static org.junit.Assert.assertFalse;
// import static org.junit.Assert.assertTrue;
// import org.junit.Test;
// import com.google.common.base.Strings;
// import org.opengroup.osdu.core.common.model.storage.Record;
// public class RecordTest {
// @Test
// public void createNewRecordId() {
// final String TENANT = "myTenant";
// Record record = new Record();
// record.createNewRecordId(TENANT);
// String idTokens[] = record.getId().split(":");
// assertEquals(3, idTokens.length);
// assertEquals(TENANT, idTokens[0]);
// assertEquals("doc", idTokens[1]);
// assertFalse(Strings.isNullOrEmpty(idTokens[2]));
// }
// @Test
// public void should_validateWhetherRecordMatchesTenantName() {
// assertTrue(Record.isRecordIdValid("tenant1:well:123", "TENANT1"));
// assertTrue(Record.isRecordIdValid("TENaNT1:doc:123", "TENaNT1"));
// assertFalse(Record.isRecordIdValid("tenant1:well:123", "abc"));
// }
// }
\ No newline at end of file
dataset-registry-core/src/test/java/org/opengroup/osdu/datasetregistry/response/CreateUpdateRecordsResponseTest.java deleted 100644 → 0
View file @ 6fd68996
// // Copyright 2017-2019, Schlumberger
// //
// // Licensed under the Apache License, Version 2.0 (the "License");
// // you may not use this file except in compliance with the License.
// // You may obtain a copy of the License at
// //
// // http://www.apache.org/licenses/LICENSE-2.0
// //
// // Unless required by applicable law or agreed to in writing, software
// // distributed under the License is distributed on an "AS IS" BASIS,
// // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// // See the License for the specific language governing permissions and
// // limitations under the License.
// package org.opengroup.osdu.storage.response;
// import static org.junit.Assert.assertArrayEquals;
// import static org.junit.Assert.assertEquals;
// import java.util.List;
// import org.junit.Test;
// import com.google.common.collect.Lists;
// import org.opengroup.osdu.core.common.model.storage.Record;
// import org.opengroup.osdu.core.common.model.storage.TransferInfo;
// public class CreateUpdateRecordsResponseTest {
// @Test
// public void should_returnRecordIdsSkippedRecordIdsInMutualExclusiveListsPlusTotalRecordCountInResponse_when_creatingPutResponse() {
// Record r1 = new Record();
// r1.setId("my id 1");
// Record r2 = new Record();
// r2.setId("my id 2");
// Record r3 = new Record();
// r3.setId("my id 3");
// Record r4 = new Record();
// r4.setId("my id 4");
// TransferInfo transfer = new TransferInfo();
// transfer.setRecordCount(4);
// transfer.setSkippedRecords(Lists.newArrayList("my id 4", "my id 1"));
// List<Record> records = Lists.newArrayList(r1, r2, r3, r4);
// CreateUpdateRecordsResponse response = new CreateUpdateRecordsResponse(transfer, records);
// assertEquals(new Integer(4), response.getRecordCount());
// assertArrayEquals(new String[] { "my id 2", "my id 3" }, response.getRecordIds().toArray());
// assertArrayEquals(new String[] { "my id 4", "my id 1" }, response.getSkippedRecordIds().toArray());
// }
// }
\ No newline at end of file
dataset-registry-core/src/test/java/org/opengroup/osdu/datasetregistry/service/EntitlementsAndCacheServiceImplTest.java deleted 100644 → 0
View file @ 6fd68996
// // Copyright 2017-2019, Schlumberger
// //
// // Licensed under the Apache License, Version 2.0 (the "License");
// // you may not use this file except in compliance with the License.
// // You may obtain a copy of the License at
// //
// // http://www.apache.org/licenses/LICENSE-2.0
// //
// // Unless required by applicable law or agreed to in writing, software
// // distributed under the License is distributed on an "AS IS" BASIS,
// // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// // See the License for the specific language governing permissions and
// // limitations under the License.
// package org.opengroup.osdu.storage.service;
// import org.apache.http.HttpStatus;
// import org.junit.Before;
// import org.junit.Test;
// import org.junit.runner.RunWith;
// import org.mockito.InjectMocks;
// import org.mockito.Mock;
// import org.mockito.runners.MockitoJUnitRunner;
// import org.opengroup.osdu.core.common.model.entitlements.Acl;
// import org.opengroup.osdu.core.common.model.http.DpsHeaders;
// import org.opengroup.osdu.core.common.cache.ICache;
// import org.opengroup.osdu.core.common.model.entitlements.EntitlementsException;
// import org.opengroup.osdu.core.common.model.entitlements.GroupInfo;
// import org.opengroup.osdu.core.common.model.entitlements.Groups;
// import org.opengroup.osdu.core.common.model.http.AppException;
// import org.opengroup.osdu.core.common.http.HttpResponse;
// import org.opengroup.osdu.core.common.entitlements.IEntitlementsFactory;
// import org.opengroup.osdu.core.common.entitlements.IEntitlementsService;
// import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
// import org.opengroup.osdu.core.common.model.storage.RecordMetadata;
// import java.util.*;
// import static org.junit.Assert.assertEquals;
// import static org.junit.Assert.fail;
// import static org.mockito.Mockito.*;
// @RunWith(MockitoJUnitRunner.class)
// public class EntitlementsAndCacheServiceImplTest {
// private static final String MEMBER_EMAIL = "tester@gmail.com";
// private static final String HEADER_ACCOUNT_ID = "anyTenant";
// private static final String HEADER_AUTHORIZATION = "anyCrazyToken";
// @Mock
// private IEntitlementsFactory entitlementFactory;
// @Mock
// private ICache<String, Groups> cache;
// private DpsHeaders headers;
// @Mock
// private IEntitlementsService entitlementService;
// @Mock
// private JaxRsDpsLog logger;
// @Mock
// private DpsHeaders dpsHeaders;
// @Mock
// private EntitlementsAndCacheServiceImpl entitlementsAndCacheService;
// @InjectMocks
// private EntitlementsAndCacheServiceImpl sut;
// private static final Map<String, String> headerMap = new HashMap<>();
// @Before
// public void setup() {
// setDefaultHeaders();
// this.headers = DpsHeaders.createFromMap(headerMap);
// when(this.entitlementFactory.create(this.headers)).thenReturn(this.entitlementService);
// }
// private void setDefaultHeaders() {
// headerMap.put(DpsHeaders.ACCOUNT_ID, HEADER_ACCOUNT_ID);
// headerMap.put(DpsHeaders.AUTHORIZATION, HEADER_AUTHORIZATION);
// }
// @Test
// public void should_returnMemberEmail_when_authorizationIsSuccessfull() throws Exception {
// GroupInfo g1 = new GroupInfo();
// g1.setEmail("role1@gmail.com");
// g1.setName("role1");
// GroupInfo g2 = new GroupInfo();
// g2.setEmail("role2@gmail.com");
// g2.setName("role2");
// List<GroupInfo> groupsInfo = new ArrayList<>();
// groupsInfo.add(g1);
// groupsInfo.add(g2);
// Groups groups = new Groups();
// groups.setGroups(groupsInfo);
// groups.setDesId(MEMBER_EMAIL);
// when(this.entitlementService.getGroups()).thenReturn(groups);
// assertEquals(MEMBER_EMAIL, this.sut.authorize(this.headers, "role2"));
// }
// @Test
// public void should_returnHttp403_when_userDoesNotBelongToRoleGroup() throws EntitlementsException {
// GroupInfo g1 = new GroupInfo();
// g1.setEmail("role1@gmail.com");
// g1.setName("role1");
// GroupInfo g2 = new GroupInfo();
// g2.setEmail("role2@gmail.com");
// g2.setName("role2");
// List<GroupInfo> groupsInfo = new ArrayList<>();
// groupsInfo.add(g1);
// groupsInfo.add(g2);
// Groups groups = new Groups();
// groups.setGroups(groupsInfo);
// groups.setDesId(MEMBER_EMAIL);
// when(this.entitlementService.getGroups()).thenReturn(groups);
// try {
// this.sut.authorize(this.headers, "role3");
// fail("Should not succeed");
// } catch (AppException e) {
// assertEquals(HttpStatus.SC_FORBIDDEN, e.getError().getCode());
// assertEquals("Access denied", e.getError().getReason());
// assertEquals("The user is not authorized to perform this action", e.getError().getMessage());
// } catch (Exception e) {
// fail("Should not get different exception");
// }
// }
// @Test
// public void should_throwAppException_when_entitlementExceptionHappens() throws EntitlementsException {
// final String ERROR_MSG = "FATAL ERROR";
// HttpResponse response = mock(HttpResponse.class);
// when(response.isServerErrorCode()).thenReturn(true);
// when(response.getResponseCode()).thenReturn(HttpStatus.SC_INTERNAL_SERVER_ERROR);
// EntitlementsException expectedException = new EntitlementsException(ERROR_MSG, response);
// when(this.entitlementService.getGroups()).thenThrow(expectedException);
// try {
// this.sut.authorize(this.headers, "role3");
// fail("Should not succeed");
// } catch (AppException e) {
// assertEquals(HttpStatus.SC_INTERNAL_SERVER_ERROR, e.getError().getCode());
// assertEquals("Access denied", e.getError().getReason());
// assertEquals("The user is not authorized to perform this action", e.getError().getMessage());
// } catch (Exception e) {
// fail("Should not get different exception");
// }
// }
// @Test
// public void should_getGroupsFromCache_when_requestHashIsFoundInCache() throws EntitlementsException {
// GroupInfo g1 = new GroupInfo();
// g1.setEmail("role1@gmail.com");
// g1.setName("role1");
// GroupInfo g2 = new GroupInfo();
// g2.setEmail("role2@gmail.com");
// g2.setName("role2");
// List<GroupInfo> groupsInfo = new ArrayList<>();
// groupsInfo.add(g1);
// groupsInfo.add(g2);
// Groups groups = new Groups();
// groups.setGroups(groupsInfo);
// groups.setDesId(MEMBER_EMAIL);
// when(this.entitlementService.getGroups()).thenReturn(groups);
// // First call, getting groups from entitlements
// assertEquals(MEMBER_EMAIL, this.sut.authorize(this.headers, "role2"));
// when(this.cache.get("NLdxKQ==")).thenReturn(groups);
// // Second call, getting groups from cache
// assertEquals(MEMBER_EMAIL, this.sut.authorize(this.headers, "role2"));
// verify(this.entitlementService, times(1)).getGroups();
// verify(this.cache, times(2)).get("NLdxKQ==");
// verify(this.cache, times(1)).put("NLdxKQ==", groups);
// }
// @Test
// public void should_returnTrue_when_AclIsValid() throws EntitlementsException {
// GroupInfo g1 = new GroupInfo();
// g1.setEmail("role1@tenant.gmail.com");
// g1.setName("role1");
// List<GroupInfo> groupsInfo = new ArrayList<>();
// groupsInfo.add(g1);
// Groups groups = new Groups();
// groups.setGroups(groupsInfo);
// when(this.entitlementService.getGroups()).thenReturn(groups);
// Set<String> acls = new HashSet<>();
// acls.add("valid@tenant.gmail.com");
// acls.add("valid2@tenant.gmail.com");
// assertEquals(true, this.sut.isValidAcl(this.headers, acls));
// }
// @Test
// public void should_returnFalse_when_AclIsNotValid() throws EntitlementsException {
// GroupInfo g1 = new GroupInfo();
// g1.setEmail("role1@tenant.gmail.com");
// g1.setName("role1");
// List<GroupInfo> groupsInfo = new ArrayList<>();
// groupsInfo.add(g1);
// Groups groups = new Groups();
// groups.setGroups(groupsInfo);
// when(this.entitlementService.getGroups()).thenReturn(groups);
// Set<String> acls = new HashSet<>();
// acls.add("valid@tenant.gmail.com");
// acls.add("invalid@test.whatever.com");
// assertEquals(false, this.sut.isValidAcl(this.headers, acls));
// }
// @Test
// public void should_returnFalse_when_NotInOwnerList() throws EntitlementsException {
// GroupInfo g1 = new GroupInfo();
// g1.setEmail("role1@tenant.slb.com");
// g1.setName("role1");
// List<GroupInfo> groupsInfo = new ArrayList<>();
// groupsInfo.add(g1);
// Groups groups = new Groups();
// groups.setGroups(groupsInfo);
// when(this.entitlementService.getGroups()).thenReturn(groups);
// String[] ownerList = new String[]{"owner1@tenant.slb.com", "owner2@tenant.slb.com"};
// assertEquals(false, this.sut.hasOwnerAccess(this.headers, ownerList));
// }
// @Test
// public void should_returnTrue_when_UserInOwnerList() throws EntitlementsException {
// GroupInfo g1 = new GroupInfo();
// g1.setEmail("role1@tenant.slb.com");
// g1.setName("role1");
// List<GroupInfo> groupsInfo = new ArrayList<>();
// groupsInfo.add(g1);
// Groups groups = new Groups();
// groups.setGroups(groupsInfo);
// when(this.entitlementService.getGroups()).thenReturn(groups);
// String[] ownerList = new String[]{"role1@tenant.slb.com", "owner2@tenant.slb.com"};
// assertEquals(true, this.sut.hasOwnerAccess(this.headers, ownerList));
// }
// @Test(expected = AppException.class)
// public void should_throwAppException_when_NoGroupGotFromCacheOrEntitlements() throws EntitlementsException {
// List<GroupInfo> groupsInfo = new ArrayList<>();
// Groups groups = new Groups();
// groups.setGroups(groupsInfo);
// when(this.entitlementService.getGroups()).thenReturn(groups);
// Set<String> acls = new HashSet<>();
// acls.add("valid@tenant.gmail.com");
// this.sut.isValidAcl(this.headers, acls);
// }
// @Test(expected = AppException.class)
// public void should_throwAppException_when_EmailOfGroupNotMatchingValidRegex_NoAtSymbol()
// throws EntitlementsException {
// GroupInfo g1 = new GroupInfo();
// g1.setEmail("test.tenant.gmail.com");
// g1.setName("role1");
// List<GroupInfo> groupsInfo = new ArrayList<>();
// groupsInfo.add(g1);
// Groups groups = new Groups();
// groups.setGroups(groupsInfo);
// when(this.entitlementService.getGroups()).thenReturn(groups);
// Set<String> acls = new HashSet<>();
// acls.add("valid@tenant.gmail.com");
// this.sut.isValidAcl(this.headers, acls);
// }
// @Test(expected = AppException.class)
// public void should_throwAppException_when_EmailOfGroupNotMatchingValidRegex_NoGroupName()
// throws EntitlementsException {
// GroupInfo g1 = new GroupInfo();
// g1.setEmail("@tenant.gmail.com");
// g1.setName("role1");
// List<GroupInfo> groupsInfo = new ArrayList<>();
// groupsInfo.add(g1);
// Groups groups = new Groups();
// groups.setGroups(groupsInfo);
// when(this.entitlementService.getGroups()).thenReturn(groups);
// Set<String> acls = new HashSet<>();
// acls.add("valid@tenant.gmail.com");
// this.sut.isValidAcl(this.headers, acls);
// }
// @Test(expected = AppException.class)
// public void should_throwAppException_when_EmailOfGroupNotMatchingValidRegex_DomainTooSimple()
// throws EntitlementsException {
// GroupInfo g1 = new GroupInfo();
// g1.setEmail("test@tenantgmailcom");
// g1.setName("role1");
// List<GroupInfo> groupsInfo = new ArrayList<>();
// groupsInfo.add(g1);
// Groups groups = new Groups();
// groups.setGroups(groupsInfo);
// when(this.entitlementService.getGroups()).thenReturn(groups);
// Set<String> acls = new HashSet<>();
// acls.add("valid@tenant.gmail.com");
// this.sut.isValidAcl(this.headers, acls);
// }
// @Test
// public void should_returnTrue_when_aclContainedInGroups() throws EntitlementsException {
// GroupInfo g1 = new GroupInfo();
// g1.setEmail("role1@slb.com");
// g1.setName("role1");
// GroupInfo g2 = new GroupInfo();
// g2.setEmail("role2@slb.com");
// g2.setName("role2");
// List<GroupInfo> groupsInfo = new ArrayList<>();
// groupsInfo.add(g1);
// groupsInfo.add(g2);
// Groups groups = new Groups();
// groups.setGroups(groupsInfo);
// groups.setDesId(MEMBER_EMAIL);
// when(this.entitlementService.getGroups()).thenReturn(groups);
// String[] viewers = new String[]{"role1@slb.com"};
// String[] owners = new String[]{"role2@slb.com"};
// Acl storageAcl = new Acl();
// storageAcl.setOwners(owners);
// storageAcl.setViewers(viewers);
// RecordMetadata recordMetadata = new RecordMetadata();
// recordMetadata.setAcl(storageAcl);
// recordMetadata.setId("acl-check-1");
// List<RecordMetadata> input = new ArrayList<>();
// input.add(recordMetadata);
// List<RecordMetadata> result = this.sut.hasValidAccess(input, this.headers);
// assertEquals(1, result.size());
// assertEquals("acl-check-1", result.get(0).getId());
// }
// @Test
// public void should_returnTrue_when_aclNotContainedInGroups() throws EntitlementsException {
// GroupInfo g1 = new GroupInfo();
// g1.setEmail("role1@slb.com");
// g1.setName("role1");
// GroupInfo g2 = new GroupInfo();
// g2.setEmail("role2@slb.com");
// g2.setName("role2");
// List<GroupInfo> groupsInfo = new ArrayList<>();
// groupsInfo.add(g1);
// groupsInfo.add(g2);
// Groups groups = new Groups();
// groups.setGroups(groupsInfo);
// groups.setDesId(MEMBER_EMAIL);
// when(this.entitlementService.getGroups()).thenReturn(groups);
// String[] viewers = new String[]{"role3@slb.com"};
// String[] owners = new String[]{"role4@slb.com"};
// Acl storageAcl = new Acl();
// storageAcl.setOwners(owners);
// storageAcl.setViewers(viewers);
// RecordMetadata recordMetadata = new RecordMetadata();
// recordMetadata.setAcl(storageAcl);
// recordMetadata.setId("acl-check-2");
// List<RecordMetadata> input = new ArrayList<>();
// input.add(recordMetadata);
// List<RecordMetadata> result = this.sut.hasValidAccess(input, this.headers);
// assertEquals(0, result.size());
// }
// }
dataset-registry-core/src/test/java/org/opengroup/osdu/datasetregistry/service/RecordServiceImplTest.java deleted 100644 → 0
View file @ 6fd68996
// // Copyright 2017-2019, Schlumberger
// //
// // Licensed under the Apache License, Version 2.0 (the "License");
// // you may not use this file except in compliance with the License.
// // You may obtain a copy of the License at
// //
// // http://www.apache.org/licenses/LICENSE-2.0
// //
// // Unless required by applicable law or agreed to in writing, software
// // distributed under the License is distributed on an "AS IS" BASIS,
// // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// // See the License for the specific language governing permissions and
// // limitations under the License.
// package org.opengroup.osdu.storage.service;
// import static org.junit.Assert.assertEquals;
// import static org.junit.Assert.assertNotNull;
// import static org.junit.Assert.fail;
// import static org.mockito.Matchers.any;
// import static org.mockito.Matchers.eq;
// import static org.mockito.Mockito.*;
// import java.util.*;
// import com.google.common.collect.Lists;
// import org.opengroup.osdu.core.common.entitlements.IEntitlementsAndCacheService;
// import org.opengroup.osdu.core.common.model.entitlements.Acl;
// import org.opengroup.osdu.core.common.model.http.AppException;
// import org.opengroup.osdu.core.common.model.indexer.OperationType;
// import org.opengroup.osdu.core.common.model.storage.*;
// import org.opengroup.osdu.core.common.storage.IPersistenceService;
// import org.opengroup.osdu.storage.provider.interfaces.ICloudStorage;
// import org.opengroup.osdu.storage.provider.interfaces.IMessageBus;
// import org.opengroup.osdu.storage.provider.interfaces.IRecordsMetadataRepository;
// import org.apache.http.HttpStatus;
// import org.junit.Before;
// import org.junit.Test;
// import org.junit.runner.RunWith;
// import org.mockito.ArgumentCaptor;
// import org.mockito.InjectMocks;