Repository: incubator-ranger Updated Branches: refs/heads/master 9918c8d25 -> 1a2f3f33c
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerValidator.java ---------------------------------------------------------------------- diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerValidator.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerValidator.java index e180263..f189c21 100644 --- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerValidator.java +++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerValidator.java @@ -20,12 +20,6 @@ package org.apache.ranger.plugin.model.validation; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -50,6 +44,7 @@ import org.apache.ranger.plugin.model.RangerServiceDef.RangerServiceConfigDef; import org.apache.ranger.plugin.model.validation.RangerValidator.Action; import org.apache.ranger.plugin.store.ServiceStore; import org.apache.ranger.plugin.util.SearchFilter; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -86,7 +81,7 @@ public class TestRangerValidator { try { // service store can't be null during construction new RangerValidatorForTest(null); - fail("Should have thrown exception!"); + Assert.fail("Should have thrown exception!"); } catch (IllegalArgumentException e) { // expected exception } @@ -97,11 +92,11 @@ public class TestRangerValidator { // default implementation should fail. This is abstract class. Sub-class must do something sensible with isValid try { _validator.validate(1L, Action.CREATE); - fail("Should have thrown exception!"); + Assert.fail("Should have thrown exception!"); } catch (Exception e) { // ok expected exception String message = e.getMessage(); - assertTrue(message.contains("internal error")); + Assert.assertTrue(message.contains("internal error")); } } @@ -109,26 +104,26 @@ public class TestRangerValidator { public void test_getServiceConfigParameters() { // reasonable protection against null values Set<String> parameters = _validator.getServiceConfigParameters(null); - assertNotNull(parameters); - assertTrue(parameters.isEmpty()); + Assert.assertNotNull(parameters); + Assert.assertTrue(parameters.isEmpty()); RangerService service = mock(RangerService.class); when(service.getConfigs()).thenReturn(null); parameters = _validator.getServiceConfigParameters(service); - assertNotNull(parameters); - assertTrue(parameters.isEmpty()); + Assert.assertNotNull(parameters); + Assert.assertTrue(parameters.isEmpty()); when(service.getConfigs()).thenReturn(new HashMap<String, String>()); parameters = _validator.getServiceConfigParameters(service); - assertNotNull(parameters); - assertTrue(parameters.isEmpty()); + Assert.assertNotNull(parameters); + Assert.assertTrue(parameters.isEmpty()); String[] keys = new String[] { "a", "b", "c" }; Map<String, String> map = _utils.createMap(keys); when(service.getConfigs()).thenReturn(map); parameters = _validator.getServiceConfigParameters(service); for (String key: keys) { - assertTrue("key", parameters.contains(key)); + Assert.assertTrue("key", parameters.contains(key)); } } @@ -136,20 +131,20 @@ public class TestRangerValidator { public void test_getRequiredParameters() { // reasonable protection against null things Set<String> parameters = _validator.getRequiredParameters(null); - assertNotNull(parameters); - assertTrue(parameters.isEmpty()); + Assert.assertNotNull(parameters); + Assert.assertTrue(parameters.isEmpty()); RangerServiceDef serviceDef = mock(RangerServiceDef.class); when(serviceDef.getConfigs()).thenReturn(null); parameters = _validator.getRequiredParameters(null); - assertNotNull(parameters); - assertTrue(parameters.isEmpty()); + Assert.assertNotNull(parameters); + Assert.assertTrue(parameters.isEmpty()); List<RangerServiceConfigDef> configs = new ArrayList<RangerServiceDef.RangerServiceConfigDef>(); when(serviceDef.getConfigs()).thenReturn(configs); parameters = _validator.getRequiredParameters(null); - assertNotNull(parameters); - assertTrue(parameters.isEmpty()); + Assert.assertNotNull(parameters); + Assert.assertTrue(parameters.isEmpty()); Object[][] input = new Object[][] { { "param1", false }, @@ -160,8 +155,8 @@ public class TestRangerValidator { configs = _utils.createServiceConditionDefs(input); when(serviceDef.getConfigs()).thenReturn(configs); parameters = _validator.getRequiredParameters(serviceDef); - assertTrue("result does not contain: param2", parameters.contains("param2")); - assertTrue("result does not contain: param3", parameters.contains("param3")); + Assert.assertTrue("result does not contain: param2", parameters.contains("param2")); + Assert.assertTrue("result does not contain: param3", parameters.contains("param3")); } @Test @@ -174,12 +169,12 @@ public class TestRangerValidator { when(_store.getServiceDefByName("good-service")).thenReturn(serviceDef); } catch (Exception e) { e.printStackTrace(); - fail("Unexpected exception during mocking!"); + Assert.fail("Unexpected exception during mocking!"); } - assertNull(_validator.getServiceDef("return null")); - assertNull(_validator.getServiceDef("throw")); - assertFalse(_validator.getServiceDef("good-service") == null); + Assert.assertNull(_validator.getServiceDef("return null")); + Assert.assertNull(_validator.getServiceDef("throw")); + Assert.assertFalse(_validator.getServiceDef("good-service") == null); } @Test @@ -190,9 +185,9 @@ public class TestRangerValidator { RangerPolicy policy = mock(RangerPolicy.class); when(_store.getPolicy(3L)).thenReturn(policy); - assertNull(_validator.getPolicy(1L)); - assertNull(_validator.getPolicy(2L)); - assertTrue(_validator.getPolicy(3L) != null); + Assert.assertNull(_validator.getPolicy(1L)); + Assert.assertNull(_validator.getPolicy(2L)); + Assert.assertTrue(_validator.getPolicy(3L) != null); } @Test @@ -202,9 +197,9 @@ public class TestRangerValidator { String serviceName = "service-name"; boolean isPolicyEnabled = true; when(_store.getPoliciesByResourceSignature(serviceName, hexSignature, isPolicyEnabled)).thenReturn(null); - assertNull(_validator.getPoliciesForResourceSignature(serviceName, hexSignature)); + Assert.assertNull(_validator.getPoliciesForResourceSignature(serviceName, hexSignature)); when(_store.getPoliciesByResourceSignature(serviceName, hexSignature, isPolicyEnabled)).thenThrow(new Exception()); - assertNull(_validator.getPoliciesForResourceSignature(serviceName, hexSignature)); + Assert.assertNull(_validator.getPoliciesForResourceSignature(serviceName, hexSignature)); // what ever store returns should come back hexSignature = "anotherSignature"; @@ -215,7 +210,7 @@ public class TestRangerValidator { policies.add(policy2); when(_store.getPoliciesByResourceSignature(serviceName, hexSignature, isPolicyEnabled)).thenReturn(policies); List<RangerPolicy> result = _validator.getPoliciesForResourceSignature(serviceName, hexSignature); - assertTrue(result.contains(policy1) && result.contains(policy2)); + Assert.assertTrue(result.contains(policy1) && result.contains(policy2)); } @Test @@ -226,9 +221,9 @@ public class TestRangerValidator { RangerService service = mock(RangerService.class); when(_store.getService(3L)).thenReturn(service); - assertNull(_validator.getService(1L)); - assertNull(_validator.getService(2L)); - assertTrue(_validator.getService(3L) != null); + Assert.assertNull(_validator.getService(1L)); + Assert.assertNull(_validator.getService(2L)); + Assert.assertTrue(_validator.getService(3L) != null); } @Test @@ -241,66 +236,66 @@ public class TestRangerValidator { when(_store.getServiceByName("good-service")).thenReturn(service); } catch (Exception e) { e.printStackTrace(); - fail("Unexpected exception during mocking!"); + Assert.fail("Unexpected exception during mocking!"); } - assertNull(_validator.getService("return null")); - assertNull(_validator.getService("throw")); - assertFalse(_validator.getService("good-service") == null); + Assert.assertNull(_validator.getService("return null")); + Assert.assertNull(_validator.getService("throw")); + Assert.assertFalse(_validator.getService("good-service") == null); } @Test public void test_getAccessTypes() { // passing in null service def Set<String> accessTypes = _validator.getAccessTypes((RangerServiceDef)null); - assertTrue(accessTypes.isEmpty()); + Assert.assertTrue(accessTypes.isEmpty()); // that has null or empty access type def RangerServiceDef serviceDef = mock(RangerServiceDef.class); when(serviceDef.getAccessTypes()).thenReturn(null); accessTypes = _validator.getAccessTypes(serviceDef); - assertTrue(accessTypes.isEmpty()); + Assert.assertTrue(accessTypes.isEmpty()); List<RangerAccessTypeDef> accessTypeDefs = new ArrayList<RangerServiceDef.RangerAccessTypeDef>(); when(serviceDef.getAccessTypes()).thenReturn(accessTypeDefs); accessTypes = _validator.getAccessTypes(serviceDef); - assertTrue(accessTypes.isEmpty()); + Assert.assertTrue(accessTypes.isEmpty()); // having null accesstypedefs accessTypeDefs.add(null); accessTypes = _validator.getAccessTypes(serviceDef); - assertTrue(accessTypes.isEmpty()); + Assert.assertTrue(accessTypes.isEmpty()); // access type defs with null empty blank names are skipped, spaces within names are preserved String[] names = new String[] { null, "", "a", " ", "b ", " ", " C", " D " }; accessTypeDefs.addAll(_utils.createAccessTypeDefs(names)); accessTypes = _validator.getAccessTypes(serviceDef); - assertEquals(4, accessTypes.size()); - assertTrue(accessTypes.contains("a")); - assertTrue(accessTypes.contains("b ")); - assertTrue(accessTypes.contains(" c")); - assertTrue(accessTypes.contains(" d ")); + Assert.assertEquals(4, accessTypes.size()); + Assert.assertTrue(accessTypes.contains("a")); + Assert.assertTrue(accessTypes.contains("b ")); + Assert.assertTrue(accessTypes.contains(" c")); + Assert.assertTrue(accessTypes.contains(" d ")); } @Test public void test_getResourceNames() { // passing in null service def Set<String> accessTypes = _validator.getMandatoryResourceNames((RangerServiceDef)null); - assertTrue(accessTypes.isEmpty()); + Assert.assertTrue(accessTypes.isEmpty()); // that has null or empty access type def RangerServiceDef serviceDef = mock(RangerServiceDef.class); when(serviceDef.getResources()).thenReturn(null); accessTypes = _validator.getMandatoryResourceNames(serviceDef); - assertTrue(accessTypes.isEmpty()); + Assert.assertTrue(accessTypes.isEmpty()); List<RangerResourceDef> resourceDefs = new ArrayList<RangerResourceDef>(); when(serviceDef.getResources()).thenReturn(resourceDefs); accessTypes = _validator.getMandatoryResourceNames(serviceDef); - assertTrue(accessTypes.isEmpty()); + Assert.assertTrue(accessTypes.isEmpty()); // having null accesstypedefs resourceDefs.add(null); accessTypes = _validator.getMandatoryResourceNames(serviceDef); - assertTrue(accessTypes.isEmpty()); + Assert.assertTrue(accessTypes.isEmpty()); // access type defs with null empty blank names are skipped, spaces within names are preserved Object[][] data = { @@ -315,37 +310,37 @@ public class TestRangerValidator { }; resourceDefs.addAll(_utils.createResourceDefs(data)); accessTypes = _validator.getMandatoryResourceNames(serviceDef); - assertEquals(2, accessTypes.size()); - assertTrue(accessTypes.contains("a")); - assertTrue(accessTypes.contains("d")); // name should come back lower case + Assert.assertEquals(2, accessTypes.size()); + Assert.assertTrue(accessTypes.contains("a")); + Assert.assertTrue(accessTypes.contains("d")); // name should come back lower case accessTypes = _validator.getAllResourceNames(serviceDef); - assertEquals(5, accessTypes.size()); - assertTrue(accessTypes.contains("b")); - assertTrue(accessTypes.contains("c")); - assertTrue(accessTypes.contains("e")); + Assert.assertEquals(5, accessTypes.size()); + Assert.assertTrue(accessTypes.contains("b")); + Assert.assertTrue(accessTypes.contains("c")); + Assert.assertTrue(accessTypes.contains("e")); } @Test public void test_getValidationRegExes() { // passing in null service def Map<String, String> regExMap = _validator.getValidationRegExes((RangerServiceDef)null); - assertTrue(regExMap.isEmpty()); + Assert.assertTrue(regExMap.isEmpty()); // that has null or empty access type def RangerServiceDef serviceDef = mock(RangerServiceDef.class); when(serviceDef.getResources()).thenReturn(null); regExMap = _validator.getValidationRegExes(serviceDef); - assertTrue(regExMap.isEmpty()); + Assert.assertTrue(regExMap.isEmpty()); List<RangerResourceDef> resourceDefs = new ArrayList<RangerResourceDef>(); when(serviceDef.getResources()).thenReturn(resourceDefs); regExMap = _validator.getValidationRegExes(serviceDef); - assertTrue(regExMap.isEmpty()); + Assert.assertTrue(regExMap.isEmpty()); // having null accesstypedefs resourceDefs.add(null); regExMap = _validator.getValidationRegExes(serviceDef); - assertTrue(regExMap.isEmpty()); + Assert.assertTrue(regExMap.isEmpty()); // access type defs with null empty blank names are skipped, spaces within names are preserved String[][] data = { @@ -359,10 +354,10 @@ public class TestRangerValidator { }; resourceDefs.addAll(_utils.createResourceDefsWithRegEx(data)); regExMap = _validator.getValidationRegExes(serviceDef); - assertEquals(3, regExMap.size()); - assertEquals("regex1", regExMap.get("b")); - assertEquals("regex2", regExMap.get("d")); - assertEquals("regex3", regExMap.get("f")); + Assert.assertEquals(3, regExMap.size()); + Assert.assertEquals("regex1", regExMap.get("b")); + Assert.assertEquals("regex2", regExMap.get("d")); + Assert.assertEquals("regex3", regExMap.get("f")); } @Test @@ -372,27 +367,27 @@ public class TestRangerValidator { RangerPolicy policy = null; // null policy result = _validator.getPolicyResources(null); - assertTrue(result != null); - assertTrue(result.isEmpty()); + Assert.assertTrue(result != null); + Assert.assertTrue(result.isEmpty()); // null resource map policy = mock(RangerPolicy.class); when(policy.getResources()).thenReturn(null); result = _validator.getPolicyResources(null); - assertTrue(result != null); - assertTrue(result.isEmpty()); + Assert.assertTrue(result != null); + Assert.assertTrue(result.isEmpty()); // empty resource map Map<String, RangerPolicyResource> input = Maps.newHashMap(); when(policy.getResources()).thenReturn(input); result = _validator.getPolicyResources(policy); - assertTrue(result != null); - assertTrue(result.isEmpty()); + Assert.assertTrue(result != null); + Assert.assertTrue(result.isEmpty()); // known resource map input.put("r1", mock(RangerPolicyResource.class)); input.put("R2", mock(RangerPolicyResource.class)); result = _validator.getPolicyResources(policy); - assertEquals(2, result.size()); - assertTrue("r1", result.contains("r1")); - assertTrue("R2", result.contains("r2")); // result should lowercase the resource-names + Assert.assertEquals(2, result.size()); + Assert.assertTrue("r1", result.contains("r1")); + Assert.assertTrue("R2", result.contains("r2")); // result should lowercase the resource-names } @Test @@ -400,20 +395,20 @@ public class TestRangerValidator { // null policy RangerPolicy policy = null; boolean result = _validator.getIsAuditEnabled(policy); - assertFalse(result); + Assert.assertFalse(result); // null isAuditEnabled Boolean is supposed to be TRUE!! policy = mock(RangerPolicy.class); when(policy.getIsAuditEnabled()).thenReturn(null); result = _validator.getIsAuditEnabled(policy); - assertTrue(result); + Assert.assertTrue(result); // non-null value when(policy.getIsAuditEnabled()).thenReturn(Boolean.FALSE); result = _validator.getIsAuditEnabled(policy); - assertFalse(result); + Assert.assertFalse(result); when(policy.getIsAuditEnabled()).thenReturn(Boolean.TRUE); result = _validator.getIsAuditEnabled(policy); - assertTrue(result); + Assert.assertTrue(result); } @Test @@ -430,12 +425,12 @@ public class TestRangerValidator { List<RangerPolicy> result = _validator.getPolicies(serviceName, policyName); // validate store is queried with both parameters verify(_store).getPolicies(filter); - assertNull(result); + Assert.assertNull(result); // returns null if store throws an exception when(_store.getPolicies(filter)).thenThrow(new Exception()); result = _validator.getPolicies(serviceName, policyName); - assertNull(result); + Assert.assertNull(result); // does not shove policy into search filter if policy name passed in is "blank" filter = new SearchFilter(); @@ -448,7 +443,7 @@ public class TestRangerValidator { when(_store.getPolicies(filter)).thenReturn(policies); for (String aName : new String[]{ null, "", " "}) { result = _validator.getPolicies(serviceName, aName); - assertTrue(result.iterator().next() == policy); + Assert.assertTrue(result.iterator().next() == policy); } } @@ -460,19 +455,19 @@ public class TestRangerValidator { RangerServiceDef serviceDef = mock(RangerServiceDef.class); when(_store.getServiceDef(3L)).thenReturn(serviceDef); - assertNull(_validator.getServiceDef(1L)); - assertNull(_validator.getServiceDef(2L)); - assertTrue(_validator.getServiceDef(3L) != null); + Assert.assertNull(_validator.getServiceDef(1L)); + Assert.assertNull(_validator.getServiceDef(2L)); + Assert.assertTrue(_validator.getServiceDef(3L) != null); } @Test public void test_getEnumDefaultIndex() { RangerEnumDef enumDef = mock(RangerEnumDef.class); - assertEquals(-1, _validator.getEnumDefaultIndex(null)); + Assert.assertEquals(-1, _validator.getEnumDefaultIndex(null)); when(enumDef.getDefaultIndex()).thenReturn(null); - assertEquals(0, _validator.getEnumDefaultIndex(enumDef)); + Assert.assertEquals(0, _validator.getEnumDefaultIndex(enumDef)); when(enumDef.getDefaultIndex()).thenReturn(-5); - assertEquals(-5, _validator.getEnumDefaultIndex(enumDef)); + Assert.assertEquals(-5, _validator.getEnumDefaultIndex(enumDef)); } @Test @@ -480,34 +475,34 @@ public class TestRangerValidator { // passing in null gets back a null Collection<String> result = _validator.getImpliedGrants(null); - assertNull(result); + Assert.assertNull(result); // null or empty implied grant collection gets back an empty collection RangerAccessTypeDef accessTypeDef = mock(RangerAccessTypeDef.class); when(accessTypeDef.getImpliedGrants()).thenReturn(null); result = _validator.getImpliedGrants(accessTypeDef); - assertTrue(result.isEmpty()); + Assert.assertTrue(result.isEmpty()); List<String> impliedGrants = new ArrayList<String>(); when(accessTypeDef.getImpliedGrants()).thenReturn(impliedGrants); result = _validator.getImpliedGrants(accessTypeDef); - assertTrue(result.isEmpty()); + Assert.assertTrue(result.isEmpty()); // null/empty values come back as is impliedGrants = Arrays.asList(new String[] { null, "", " ", " " }); when(accessTypeDef.getImpliedGrants()).thenReturn(impliedGrants); result = _validator.getImpliedGrants(accessTypeDef); - assertEquals(4, result.size()); + Assert.assertEquals(4, result.size()); // non-empty values get lower cased impliedGrants = Arrays.asList(new String[] { "a", "B", "C ", " d " }); when(accessTypeDef.getImpliedGrants()).thenReturn(impliedGrants); result = _validator.getImpliedGrants(accessTypeDef); - assertEquals(4, result.size()); - assertTrue(result.contains("a")); - assertTrue(result.contains("b")); - assertTrue(result.contains("c ")); - assertTrue(result.contains(" d ")); + Assert.assertEquals(4, result.size()); + Assert.assertTrue(result.contains("a")); + Assert.assertTrue(result.contains("b")); + Assert.assertTrue(result.contains("c ")); + Assert.assertTrue(result.contains(" d ")); } @Test @@ -517,22 +512,22 @@ public class TestRangerValidator { Set<String> alreadySeen = new HashSet<String>(); // null/empty string value is invalid for (String value : new String[] { null, "", " " }) { - assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); + Assert.assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); _utils.checkFailureForMissingValue(_failures, fieldName); } // value should not have been seen so far. String value = "blah"; - _failures.clear(); assertTrue(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); - assertTrue(_failures.isEmpty()); - assertTrue(alreadySeen.contains(value)); + _failures.clear(); Assert.assertTrue(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); + Assert.assertTrue(_failures.isEmpty()); + Assert.assertTrue(alreadySeen.contains(value)); // since "blah" has already been seen doing this test again should fail - _failures.clear(); assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); + _failures.clear(); Assert.assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); _utils.checkFailureForSemanticError(_failures, fieldName, value); // not see check is done in a case-insenstive manner value = "bLaH"; - _failures.clear(); assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); + _failures.clear(); Assert.assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); _utils.checkFailureForSemanticError(_failures, fieldName, value); } @@ -543,17 +538,17 @@ public class TestRangerValidator { Set<Long> alreadySeen = new HashSet<Long>(); Long value = null; // null value is invalid - assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); + Assert.assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); _utils.checkFailureForMissingValue(_failures, fieldName); // value should not have been seen so far. value = 7L; - _failures.clear(); assertTrue(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); - assertTrue(_failures.isEmpty()); - assertTrue(alreadySeen.contains(value)); + _failures.clear(); Assert.assertTrue(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); + Assert.assertTrue(_failures.isEmpty()); + Assert.assertTrue(alreadySeen.contains(value)); // since 7L has already been seen doing this test again should fail - _failures.clear(); assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); + _failures.clear(); Assert.assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); _utils.checkFailureForSemanticError(_failures, fieldName, value.toString()); } @@ -564,17 +559,17 @@ public class TestRangerValidator { Set<Integer> alreadySeen = new HashSet<Integer>(); Integer value = null; // null value is invalid - assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); + Assert.assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); _utils.checkFailureForMissingValue(_failures, fieldName); // value should not have been seen so far. value = 49; - _failures.clear(); assertTrue(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); - assertTrue(_failures.isEmpty()); - assertTrue(alreadySeen.contains(value)); + _failures.clear(); Assert.assertTrue(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); + Assert.assertTrue(_failures.isEmpty()); + Assert.assertTrue(alreadySeen.contains(value)); // since 7L has already been seen doing this test again should fail - _failures.clear(); assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); + _failures.clear(); Assert.assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures)); _utils.checkFailureForSemanticError(_failures, fieldName, value.toString()); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/ValidationTestUtils.java ---------------------------------------------------------------------- diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/ValidationTestUtils.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/ValidationTestUtils.java index 5c84feb..a59a159 100644 --- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/ValidationTestUtils.java +++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/ValidationTestUtils.java @@ -19,9 +19,6 @@ package org.apache.ranger.plugin.model.validation; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -42,6 +39,7 @@ import org.apache.ranger.plugin.model.RangerServiceDef.RangerEnumElementDef; import org.apache.ranger.plugin.model.RangerServiceDef.RangerPolicyConditionDef; import org.apache.ranger.plugin.model.RangerServiceDef.RangerResourceDef; import org.apache.ranger.plugin.model.RangerServiceDef.RangerServiceConfigDef; +import org.junit.Assert; public class ValidationTestUtils { @@ -86,7 +84,7 @@ public class ValidationTestUtils { // check if any one of the sub-fields is present void checkFailureForMissingValue(List<ValidationFailureDetails> failures, String field, String[] subFields) { if (CollectionUtils.isEmpty(failures)) { - fail("List of failures is null/empty!"); + Assert.fail("List of failures is null/empty!"); } else { boolean found = false; int i = 0; @@ -97,7 +95,7 @@ public class ValidationTestUtils { } i++; } - assertTrue(failures.toString(), found); + Assert.assertTrue(failures.toString(), found); } } @@ -111,10 +109,10 @@ public class ValidationTestUtils { void checkFailure(List<ValidationFailureDetails> failures, Boolean internalError, Boolean missing, Boolean semanticError, String field, String subField) { if (CollectionUtils.isEmpty(failures)) { - fail("List of failures is null/empty!"); + Assert.fail("List of failures is null/empty!"); } else { boolean found = hasFailure(failures, internalError, missing, semanticError, field, subField); - assertTrue(failures.toString(), found); + Assert.assertTrue(failures.toString(), found); } } @@ -133,7 +131,7 @@ public class ValidationTestUtils { } List<RangerAccessTypeDef> createAccessTypeDefs(String[] names) { - assertFalse(names == null); // fail if null is passed in! + Assert.assertFalse(names == null); // fail if null is passed in! List<RangerAccessTypeDef> defs = new ArrayList<RangerServiceDef.RangerAccessTypeDef>(); for (String name : names) { RangerAccessTypeDef def = mock(RangerAccessTypeDef.class); @@ -217,7 +215,7 @@ public class ValidationTestUtils { } when(policyItem.getGroups()).thenReturn(groupsList); - String[] accesses = (String[])map.get("accesses");; + String[] accesses = (String[])map.get("accesses"); Boolean[] isAllowedFlags = (Boolean[])map.get("isAllowed"); List<RangerPolicyItemAccess> accessesList = null; if (accesses != null && isAllowedFlags != null) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java ---------------------------------------------------------------------- diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java index 6a759a3..3575b29 100644 --- a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java +++ b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestServiceStore.java @@ -30,7 +30,6 @@ import org.apache.ranger.plugin.model.RangerService; import org.apache.ranger.plugin.model.RangerServiceDef; import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItem; import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyResource; -import org.apache.ranger.plugin.store.ServiceStore; import org.apache.ranger.plugin.store.file.ServiceFileStore; import org.apache.ranger.plugin.util.SearchFilter; import org.apache.ranger.plugin.util.ServicePolicies; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java ---------------------------------------------------------------------- diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java index eb2f17e..a24d32c 100644 --- a/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java +++ b/agents-common/src/test/java/org/apache/ranger/plugin/store/TestTagStore.java @@ -27,7 +27,6 @@ import java.util.*; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import org.apache.commons.collections.CollectionUtils; -import org.apache.hadoop.conf.Configuration; import org.apache.ranger.authorization.hadoop.config.RangerConfiguration; import org.apache.ranger.plugin.model.*; import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyResource; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/TestCredentialReader.java ---------------------------------------------------------------------- diff --git a/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/TestCredentialReader.java b/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/TestCredentialReader.java index 5a8857c..f20a7b4 100644 --- a/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/TestCredentialReader.java +++ b/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/TestCredentialReader.java @@ -21,9 +21,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.io.File; -import java.lang.reflect.Field; -import org.apache.hadoop.security.alias.CredentialShell; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/Testbuildks.java ---------------------------------------------------------------------- diff --git a/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/Testbuildks.java b/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/Testbuildks.java index a2ff824..8379f83 100644 --- a/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/Testbuildks.java +++ b/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/Testbuildks.java @@ -21,10 +21,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.io.File; -import java.lang.reflect.Field; - -import org.apache.hadoop.security.alias.CredentialShell; -import org.apache.ranger.credentialapi.buildks; import org.junit.Test; public class Testbuildks { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/AuthorizationSessionTest.java ---------------------------------------------------------------------- diff --git a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/AuthorizationSessionTest.java b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/AuthorizationSessionTest.java index ba2fff8..f1c0960 100644 --- a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/AuthorizationSessionTest.java +++ b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/AuthorizationSessionTest.java @@ -20,7 +20,6 @@ package org.apache.ranger.authorization.hbase; -import static org.junit.Assert.*; import static org.mockito.Mockito.*; import org.apache.hadoop.hbase.security.User; @@ -32,42 +31,42 @@ public class AuthorizationSessionTest { @Test public void testAuthorizationSession() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testOperation() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testOtherInformation() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testAccess() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testUser() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testTable() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testColumnFamily() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testColumn() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test @@ -86,53 +85,53 @@ public class AuthorizationSessionTest { try { session.verifyBuildable(); } catch (IllegalStateException e) { - fail("Shouldn't have thrown an exception!"); + Assert.fail("Shouldn't have thrown an exception!"); } // setting column-family without table is a problem session.columnFamily("family"); try { session.verifyBuildable(); - fail("Should have thrown an exception"); + Assert.fail("Should have thrown an exception"); } catch (IllegalStateException e) { } session.table("table"); try { session.verifyBuildable(); } catch (IllegalStateException e) { - fail("Shouldn't have thrown an exception!"); + Assert.fail("Shouldn't have thrown an exception!"); } // setting column without column-family is a problem session.columnFamily(null); session.column("col"); try { session.verifyBuildable(); - fail("Should have thrown an exception"); + Assert.fail("Should have thrown an exception"); } catch (IllegalStateException e) { } session.columnFamily("family"); try { session.verifyBuildable(); } catch (IllegalStateException e) { - fail("Should have thrown an exception"); + Assert.fail("Should have thrown an exception"); } } @Test public void testZapAuthorizationState() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testIsProvided() { AuthorizationSession session = new AuthorizationSession(null); - assertFalse(session.isProvided(null)); - assertFalse(session.isProvided("")); - assertTrue(session.isProvided(" ")); - assertTrue(session.isProvided("xtq")); + Assert.assertFalse(session.isProvided(null)); + Assert.assertFalse(session.isProvided("")); + Assert.assertTrue(session.isProvided(" ")); + Assert.assertTrue(session.isProvided("xtq")); } @Test public void testBuildRequest() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test @@ -152,66 +151,66 @@ public class AuthorizationSessionTest { @Test public void testPublishResults() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testIsAuthorized() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testGetDenialReason() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testGetResourceType() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testRequestToString() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testAudit() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testGetPrintableValue() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testBuildAccessDeniedMessage() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testBuildAccessDeniedMessageString() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testKnownPatternAllowedNotAudited() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testKnownPatternDisallowedNotAudited() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testAuditHandler() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } @Test public void testBuildResult() { -// fail("Not yet implemented"); +// Assert.fail("Not yet implemented"); } } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/ColumnIteratorTest.java ---------------------------------------------------------------------- diff --git a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/ColumnIteratorTest.java b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/ColumnIteratorTest.java index a94118b..d59881e 100644 --- a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/ColumnIteratorTest.java +++ b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/ColumnIteratorTest.java @@ -18,9 +18,6 @@ */ package org.apache.ranger.authorization.hbase; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -31,6 +28,7 @@ import java.util.List; import java.util.Set; import org.apache.hadoop.hbase.KeyValue; +import org.junit.Assert; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -41,14 +39,14 @@ public class ColumnIteratorTest { public void test_firewalling() { // passing null collection ColumnIterator iterator = new ColumnIterator(null); - assertFalse(iterator.hasNext()); + Assert.assertFalse(iterator.hasNext()); } @SuppressWarnings("unchecked") @Test public void test_setOfBytes() { /* - * It is pointless to test the functionality of base iterator! What we want to assert is that ColumnIterator delegates to the real iterators appropriately. + * It is pointless to test the functionality of base iterator! What we want to Assert.assert is that ColumnIterator delegates to the real iterators appropriately. */ Iterator<byte[]> iterator = mock(Iterator.class); // We want to make sure ColumnIterator will return exactly what the real iterator gives it. Let's us doctor mock iteracor to return items in a particular order. @@ -82,10 +80,10 @@ public class ColumnIteratorTest { int i = 0; while (columnIterator.hasNext()) { String value = columnIterator.next(); - assertEquals(values[i++], value); + Assert.assertEquals(values[i++], value); } // We should get back exactly as many items as were in the real iterator, no more no less - assertEquals(3, i); + Assert.assertEquals(3, i); // this should be called only once! verify(collection, times(1)).iterator(); @@ -129,10 +127,10 @@ public class ColumnIteratorTest { int i = 0; while (columnIterator.hasNext()) { String value = columnIterator.next(); - assertEquals(qualifiers[i++], value); + Assert.assertEquals(qualifiers[i++], value); } // We should get back exactly as many items as were in the real iterator, no more no less - assertEquals(3, i); + Assert.assertEquals(3, i); // this should be called only once! verify(list, times(1)).iterator(); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorTest.java ---------------------------------------------------------------------- diff --git a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorTest.java b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorTest.java index 72b86d1..19f390f 100644 --- a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorTest.java +++ b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorTest.java @@ -20,8 +20,6 @@ package org.apache.ranger.authorization.hbase; import static org.junit.Assert.*; -import java.util.Collection; -import java.util.HashMap; import java.util.Map; import java.util.Set; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilterTest.java ---------------------------------------------------------------------- diff --git a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilterTest.java b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilterTest.java index 2c460d1..643f08a 100644 --- a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilterTest.java +++ b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/RangerAuthorizationFilterTest.java @@ -24,19 +24,15 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.io.IOException; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.filter.Filter.ReturnCode; import org.junit.Test; -import com.google.common.collect.Sets; - @SuppressWarnings("deprecation") public class RangerAuthorizationFilterTest { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/TestPolicyEngine.java ---------------------------------------------------------------------- diff --git a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/TestPolicyEngine.java b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/TestPolicyEngine.java index 6ef00a7..cfac635 100644 --- a/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/TestPolicyEngine.java +++ b/hbase-agent/src/test/java/org/apache/ranger/authorization/hbase/TestPolicyEngine.java @@ -23,13 +23,9 @@ package org.apache.ranger.authorization.hbase; import static org.junit.Assert.*; import static org.mockito.Mockito.*; -import java.io.InputStream; -import java.io.InputStreamReader; import java.lang.reflect.Type; import java.util.List; -import org.apache.hadoop.hbase.security.AccessDeniedException; -import org.apache.hadoop.hbase.security.User; import org.apache.ranger.authorization.hbase.TestPolicyEngine.PolicyEngineTestCase.TestData; import org.apache.ranger.plugin.model.RangerPolicy; import org.apache.ranger.plugin.model.RangerServiceDef; @@ -41,7 +37,6 @@ import org.apache.ranger.plugin.policyengine.RangerAccessResourceImpl; import org.apache.ranger.plugin.service.RangerBasePlugin; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Test; import com.google.gson.Gson; import com.google.gson.GsonBuilder; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/hbase-agent/src/test/java/org/apache/ranger/services/hbase/TestRangerServiceHBase.java ---------------------------------------------------------------------- diff --git a/hbase-agent/src/test/java/org/apache/ranger/services/hbase/TestRangerServiceHBase.java b/hbase-agent/src/test/java/org/apache/ranger/services/hbase/TestRangerServiceHBase.java index e723392..f771620 100644 --- a/hbase-agent/src/test/java/org/apache/ranger/services/hbase/TestRangerServiceHBase.java +++ b/hbase-agent/src/test/java/org/apache/ranger/services/hbase/TestRangerServiceHBase.java @@ -18,25 +18,17 @@ */ package org.apache.ranger.services.hbase; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.ranger.plugin.client.HadoopException; import org.apache.ranger.plugin.model.RangerService; import org.apache.ranger.plugin.model.RangerServiceDef; import org.apache.ranger.plugin.service.ResourceLookupContext; -import org.apache.ranger.services.hbase.RangerServiceHBase; -import org.apache.ranger.services.hbase.client.HBaseClient; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.mockito.Mockito; - public class TestRangerServiceHBase { static final String sdName = "svcDef-HBase"; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java ---------------------------------------------------------------------- diff --git a/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java b/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java index 959310e..325f978 100644 --- a/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java +++ b/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java @@ -34,6 +34,7 @@ import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hive.service.server.HiveServer2; import org.junit.Assert; +import org.junit.Test; /** * @@ -109,15 +110,15 @@ public class HIVERangerAuthorizerTest { statement.execute("create table if not exists words (word STRING, count INT) row format delimited fields terminated by '\t' stored as textfile"); // Copy "wordcount.txt" to "target" to avoid overwriting it during load - java.io.File inputFile = new java.io.File(HIVERangerAuthorizerTest.class.getResource("../../../../../wordcount.txt").toURI()); - Path outputPath = Paths.get(inputFile.toPath().getParent().getParent().toString() + java.io.File.separator + "wordcountout.txt"); + File inputFile = new File(HIVERangerAuthorizerTest.class.getResource("../../../../../wordcount.txt").toURI()); + Path outputPath = Paths.get(inputFile.toPath().getParent().getParent().toString() + File.separator + "wordcountout.txt"); Files.copy(inputFile.toPath(), outputPath); statement.execute("LOAD DATA INPATH '" + outputPath + "' OVERWRITE INTO TABLE words"); // Just test to make sure it's working ResultSet resultSet = statement.executeQuery("SELECT * FROM words where count == '100'"); - resultSet.next(); + Assert.assertTrue(resultSet.next()); Assert.assertEquals("Mr.", resultSet.getString(1)); statement.close(); @@ -133,7 +134,7 @@ public class HIVERangerAuthorizerTest { } // this should be allowed (by the policy - user) - @org.junit.Test + @Test public void testHiveSelectAllAsBob() throws Exception { String url = "jdbc:hive2://localhost:" + port + "/rangerauthz"; @@ -141,7 +142,7 @@ public class HIVERangerAuthorizerTest { Statement statement = connection.createStatement(); ResultSet resultSet = statement.executeQuery("SELECT * FROM words where count == '100'"); - resultSet.next(); + Assert.assertTrue(resultSet.next()); Assert.assertEquals("Mr.", resultSet.getString(1)); Assert.assertEquals(100, resultSet.getInt(2)); @@ -150,7 +151,7 @@ public class HIVERangerAuthorizerTest { } // the "IT" group doesn't have permission to select all - @org.junit.Test + @Test public void testHiveSelectAllAsAlice() throws Exception { UserGroupInformation ugi = UserGroupInformation.createUserForTesting("alice", new String[] {"IT"}); @@ -175,7 +176,7 @@ public class HIVERangerAuthorizerTest { } // this should be allowed (by the policy - user) - @org.junit.Test + @Test public void testHiveSelectSpecificColumnAsBob() throws Exception { String url = "jdbc:hive2://localhost:" + port + "/rangerauthz"; @@ -183,7 +184,7 @@ public class HIVERangerAuthorizerTest { Statement statement = connection.createStatement(); ResultSet resultSet = statement.executeQuery("SELECT count FROM words where count == '100'"); - resultSet.next(); + Assert.assertTrue(resultSet.next()); Assert.assertEquals(100, resultSet.getInt(1)); statement.close(); @@ -191,7 +192,7 @@ public class HIVERangerAuthorizerTest { } // this should be allowed (by the policy - group) - @org.junit.Test + @Test public void testHiveSelectSpecificColumnAsAlice() throws Exception { UserGroupInformation ugi = UserGroupInformation.createUserForTesting("alice", new String[] {"IT"}); @@ -203,7 +204,7 @@ public class HIVERangerAuthorizerTest { Statement statement = connection.createStatement(); ResultSet resultSet = statement.executeQuery("SELECT count FROM words where count == '100'"); - resultSet.next(); + Assert.assertTrue(resultSet.next()); Assert.assertEquals(100, resultSet.getInt(1)); statement.close(); @@ -214,7 +215,7 @@ public class HIVERangerAuthorizerTest { } // An unknown user shouldn't be allowed - @org.junit.Test + @Test public void testHiveSelectSpecificColumnAsEve() throws Exception { String url = "jdbc:hive2://localhost:" + port + "/rangerauthz"; @@ -233,7 +234,7 @@ public class HIVERangerAuthorizerTest { } // test "alice", but in the wrong group - @org.junit.Test + @Test public void testHiveSelectSpecificColumnAsAliceWrongGroup() throws Exception { UserGroupInformation ugi = UserGroupInformation.createUserForTesting("alice", new String[] {"DevOps"}); @@ -259,7 +260,7 @@ public class HIVERangerAuthorizerTest { } // this should be allowed (by the policy - user) - @org.junit.Test + @Test public void testHiveUpdateAllAsBob() throws Exception { String url = "jdbc:hive2://localhost:" + port + "/rangerauthz"; @@ -269,7 +270,7 @@ public class HIVERangerAuthorizerTest { statement.execute("insert into words (word, count) values ('newword', 5)"); ResultSet resultSet = statement.executeQuery("SELECT * FROM words where word == 'newword'"); - resultSet.next(); + Assert.assertTrue(resultSet.next()); Assert.assertEquals("newword", resultSet.getString(1)); Assert.assertEquals(5, resultSet.getInt(2)); @@ -278,7 +279,7 @@ public class HIVERangerAuthorizerTest { } // this should not be allowed as "alice" can't insert into the table - @org.junit.Test + @Test public void testHiveUpdateAllAsAlice() throws Exception { UserGroupInformation ugi = UserGroupInformation.createUserForTesting("alice", new String[] {"IT"}); ugi.doAs(new PrivilegedExceptionAction<Void>() { @@ -302,7 +303,7 @@ public class HIVERangerAuthorizerTest { }); } - @org.junit.Test + @Test public void testHiveCreateDropDatabase() throws Exception { String url = "jdbc:hive2://localhost:" + port; @@ -348,7 +349,7 @@ public class HIVERangerAuthorizerTest { connection.close(); } - @org.junit.Test + @Test public void testBobSelectOnDifferentDatabase() throws Exception { String url = "jdbc:hive2://localhost:" + port; @@ -396,7 +397,7 @@ public class HIVERangerAuthorizerTest { connection.close(); } - @org.junit.Test + @Test public void testBobSelectOnDifferentTables() throws Exception { // Create a "words2" table in "rangerauthz" @@ -432,7 +433,7 @@ public class HIVERangerAuthorizerTest { connection.close(); } - @org.junit.Test + @Test public void testBobAlter() throws Exception { String url = "jdbc:hive2://localhost:" + port + "/rangerauthz"; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c5c7e67..79796cc 100644 --- a/pom.xml +++ b/pom.xml @@ -517,6 +517,7 @@ <sourceEncoding>UTF-8</sourceEncoding> <failOnViolation>true</failOnViolation> <linkXRef>false</linkXRef> + <!--<includeTests>true</includeTests>--> <verbose>true</verbose> <excludeRoots> <excludeRoot>${basedir}/src/main/generated</excludeRoot> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestChildFistClassLoader.java ---------------------------------------------------------------------- diff --git a/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestChildFistClassLoader.java b/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestChildFistClassLoader.java index de45520..4c791c7 100644 --- a/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestChildFistClassLoader.java +++ b/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/Impl/TestChildFistClassLoader.java @@ -21,7 +21,6 @@ package org.apache.ranger.plugin.classloader.test.Impl; import java.io.File; import java.net.URL; -import java.net.URLClassLoader; import org.apache.ranger.plugin.classloader.RangerPluginClassLoader; import org.apache.ranger.plugin.classloader.test.TestPlugin; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/1a2f3f33/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/TestPlugin.java ---------------------------------------------------------------------- diff --git a/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/TestPlugin.java b/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/TestPlugin.java index 145d7a5..15cb76e 100644 --- a/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/TestPlugin.java +++ b/ranger-plugin-classloader/src/test/java/org/apache/ranger/plugin/classloader/test/TestPlugin.java @@ -20,5 +20,5 @@ package org.apache.ranger.plugin.classloader.test; public interface TestPlugin { - public String print(); + String print(); }
