Repository: incubator-ranger Updated Branches: refs/heads/master 0bc79e9fb -> a39c00f95
Finished test PMD coverage Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/a39c00f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/a39c00f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/a39c00f9 Branch: refs/heads/master Commit: a39c00f952267bacec5388880f33e694bdd467c1 Parents: 0bc79e9 Author: Colm O hEigeartaigh <[email protected]> Authored: Thu Sep 1 10:32:55 2016 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu Sep 1 10:33:47 2016 +0100 ---------------------------------------------------------------------- .../services/hive/HIVERangerAuthorizerTest.java | 39 ++++++++++++++------ .../knox/client/TestRangerServiceKnox.java | 6 --- pom.xml | 2 +- .../org/apache/ranger/audit/TestAuditQueue.java | 1 - .../apache/ranger/biz/TestServiceDBStore.java | 5 ++- .../java/org/apache/ranger/biz/TestUserMgr.java | 1 - .../org/apache/ranger/common/TestDateUtil.java | 4 +- .../org/apache/ranger/rest/TestServiceREST.java | 1 - .../filter/TestRangerCSRFPreventionFilter.java | 5 +-- .../service/TestRangerServiceDefService.java | 1 - .../storm/StormRangerAuthorizerTest.java | 7 ++-- 11 files changed, 40 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a39c00f9/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 325f978..80534f1 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 @@ -118,8 +118,11 @@ public class HIVERangerAuthorizerTest { // Just test to make sure it's working ResultSet resultSet = statement.executeQuery("SELECT * FROM words where count == '100'"); - Assert.assertTrue(resultSet.next()); - Assert.assertEquals("Mr.", resultSet.getString(1)); + if (resultSet.next()) { + Assert.assertEquals("Mr.", resultSet.getString(1)); + } else { + Assert.fail("No ResultSet found"); + } statement.close(); connection.close(); @@ -142,9 +145,12 @@ public class HIVERangerAuthorizerTest { Statement statement = connection.createStatement(); ResultSet resultSet = statement.executeQuery("SELECT * FROM words where count == '100'"); - Assert.assertTrue(resultSet.next()); - Assert.assertEquals("Mr.", resultSet.getString(1)); - Assert.assertEquals(100, resultSet.getInt(2)); + if (resultSet.next()) { + Assert.assertEquals("Mr.", resultSet.getString(1)); + Assert.assertEquals(100, resultSet.getInt(2)); + } else { + Assert.fail("No ResultSet found"); + } statement.close(); connection.close(); @@ -184,8 +190,11 @@ public class HIVERangerAuthorizerTest { Statement statement = connection.createStatement(); ResultSet resultSet = statement.executeQuery("SELECT count FROM words where count == '100'"); - Assert.assertTrue(resultSet.next()); - Assert.assertEquals(100, resultSet.getInt(1)); + if (resultSet.next()) { + Assert.assertEquals(100, resultSet.getInt(1)); + } else { + Assert.fail("No ResultSet found"); + } statement.close(); connection.close(); @@ -204,8 +213,11 @@ public class HIVERangerAuthorizerTest { Statement statement = connection.createStatement(); ResultSet resultSet = statement.executeQuery("SELECT count FROM words where count == '100'"); - Assert.assertTrue(resultSet.next()); - Assert.assertEquals(100, resultSet.getInt(1)); + if (resultSet.next()) { + Assert.assertEquals(100, resultSet.getInt(1)); + } else { + Assert.fail("No ResultSet found"); + } statement.close(); connection.close(); @@ -270,9 +282,12 @@ public class HIVERangerAuthorizerTest { statement.execute("insert into words (word, count) values ('newword', 5)"); ResultSet resultSet = statement.executeQuery("SELECT * FROM words where word == 'newword'"); - Assert.assertTrue(resultSet.next()); - Assert.assertEquals("newword", resultSet.getString(1)); - Assert.assertEquals(5, resultSet.getInt(2)); + if (resultSet.next()) { + Assert.assertEquals("newword", resultSet.getString(1)); + Assert.assertEquals(5, resultSet.getInt(2)); + } else { + Assert.fail("No ResultSet found"); + } statement.close(); connection.close(); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a39c00f9/knox-agent/src/test/java/org/apache/ranger/services/knox/client/TestRangerServiceKnox.java ---------------------------------------------------------------------- diff --git a/knox-agent/src/test/java/org/apache/ranger/services/knox/client/TestRangerServiceKnox.java b/knox-agent/src/test/java/org/apache/ranger/services/knox/client/TestRangerServiceKnox.java index 3e04cf3..11a5e74 100644 --- a/knox-agent/src/test/java/org/apache/ranger/services/knox/client/TestRangerServiceKnox.java +++ b/knox-agent/src/test/java/org/apache/ranger/services/knox/client/TestRangerServiceKnox.java @@ -19,19 +19,13 @@ package org.apache.ranger.services.knox.client; -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.plugin.store.ServiceStore; import org.apache.ranger.services.knox.RangerServiceKnox; import org.junit.After; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a39c00f9/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 79796cc..39179d5 100644 --- a/pom.xml +++ b/pom.xml @@ -517,7 +517,7 @@ <sourceEncoding>UTF-8</sourceEncoding> <failOnViolation>true</failOnViolation> <linkXRef>false</linkXRef> - <!--<includeTests>true</includeTests>--> + <includeTests>true</includeTests> <verbose>true</verbose> <excludeRoots> <excludeRoot>${basedir}/src/main/generated</excludeRoot> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a39c00f9/security-admin/src/test/java/org/apache/ranger/audit/TestAuditQueue.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/audit/TestAuditQueue.java b/security-admin/src/test/java/org/apache/ranger/audit/TestAuditQueue.java index 637e43f..52c9cb9 100644 --- a/security-admin/src/test/java/org/apache/ranger/audit/TestAuditQueue.java +++ b/security-admin/src/test/java/org/apache/ranger/audit/TestAuditQueue.java @@ -44,7 +44,6 @@ import org.apache.ranger.audit.queue.AuditQueue; import org.apache.ranger.audit.queue.AuditSummaryQueue; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; public class TestAuditQueue { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a39c00f9/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java b/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java index ea1563e..2b773da 100644 --- a/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java +++ b/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java @@ -2499,6 +2499,7 @@ public class TestServiceDBStore { thrown.expect(Exception.class); List<RangerPolicy> dbRangerPolicy = serviceDBStore.getServicePolicies( Id, filter); + Assert.assertFalse(dbRangerPolicy.isEmpty()); Mockito.verify(daoManager).getXXService(); } @@ -2607,8 +2608,8 @@ public class TestServiceDBStore { Mockito.when(daoManager.getXXService()).thenReturn(xServiceDao); Mockito.when(xServiceDao.getById(Id)).thenReturn(xService); - PList<RangerPolicy> dbRangerPolicyList = serviceDBStore - .getPaginatedServicePolicies(rangerService.getId(), filter); + //PList<RangerPolicy> dbRangerPolicyList = + serviceDBStore.getPaginatedServicePolicies(rangerService.getId(), filter); Mockito.verify(daoManager).getXXService(); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a39c00f9/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java b/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java index 701ec4f..d77b691 100644 --- a/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java +++ b/security-admin/src/test/java/org/apache/ranger/biz/TestUserMgr.java @@ -56,7 +56,6 @@ import org.apache.ranger.view.VXString; import org.apache.ranger.view.VXUserPermission; import org.junit.Assert; import org.junit.FixMethodOrder; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a39c00f9/security-admin/src/test/java/org/apache/ranger/common/TestDateUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/common/TestDateUtil.java b/security-admin/src/test/java/org/apache/ranger/common/TestDateUtil.java index 1673f6f..9d2ef55 100644 --- a/security-admin/src/test/java/org/apache/ranger/common/TestDateUtil.java +++ b/security-admin/src/test/java/org/apache/ranger/common/TestDateUtil.java @@ -30,6 +30,8 @@ public class TestDateUtil { @Autowired DateUtil dateUtil = new DateUtil(); + @Test + @Ignore public void testGetDateFromNow() { int days = 1; Date dateCheck= dateUtil.getDateFromNow(days); @@ -72,4 +74,4 @@ public class TestDateUtil { Assert.assertEquals(currentDate.getMinutes(),mins); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a39c00f9/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java index 48acaa0..6ab3011 100644 --- a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java +++ b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.Set; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import javax.ws.rs.WebApplicationException; import org.apache.commons.lang.StringUtils; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a39c00f9/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerCSRFPreventionFilter.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerCSRFPreventionFilter.java b/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerCSRFPreventionFilter.java index f15def4..36424b4 100644 --- a/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerCSRFPreventionFilter.java +++ b/security-admin/src/test/java/org/apache/ranger/security/web/filter/TestRangerCSRFPreventionFilter.java @@ -29,7 +29,6 @@ import org.junit.Test; import org.mockito.Mockito; import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.verify; public class TestRangerCSRFPreventionFilter { @@ -52,7 +51,7 @@ public class TestRangerCSRFPreventionFilter { RangerCSRFPreventionFilter filter = new RangerCSRFPreventionFilter(); filter.doFilter(mockReq, mockRes, mockChain); - verify(mockRes, atLeastOnce()).sendError(HttpServletResponse.SC_BAD_REQUEST, EXPECTED_MESSAGE); + Mockito.verify(mockRes, atLeastOnce()).sendError(HttpServletResponse.SC_BAD_REQUEST, EXPECTED_MESSAGE); Mockito.verifyZeroInteractions(mockChain); } @@ -149,4 +148,4 @@ public class TestRangerCSRFPreventionFilter { Mockito.verifyZeroInteractions(mockChain); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a39c00f9/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java index b67ae1b..d65b0d6 100644 --- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java +++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.apache.avro.generic.GenericData; import org.apache.ranger.common.ContextUtil; import org.apache.ranger.common.JSONUtil; import org.apache.ranger.common.StringUtil; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a39c00f9/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java ---------------------------------------------------------------------- diff --git a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java index 591984f..4704eb5 100644 --- a/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java +++ b/storm-agent/src/test/java/org/apache/ranger/authorization/storm/StormRangerAuthorizerTest.java @@ -28,6 +28,7 @@ import org.apache.storm.generated.RebalanceOptions; import org.apache.storm.topology.TopologyBuilder; import org.junit.Assert; import org.junit.Ignore; +import org.junit.Test; /** * A simple test that wires a WordSpout + WordCounterBolt into a topology and runs it. The "RangerStormAuthorizer" takes care of authorization. @@ -78,7 +79,7 @@ public class StormRangerAuthorizerTest { // "bob" can't create topologies other than "word-count" and "temp*" @Ignore - @org.junit.Test + @Test public void testCreateTopologyBob() throws Exception { final Config conf = new Config(); conf.setDebug(true); @@ -104,7 +105,7 @@ public class StormRangerAuthorizerTest { } @Ignore - @org.junit.Test + @Test public void testTopologyActivation() throws Exception { final Subject subject = new Subject(); subject.getPrincipals().add(new SimplePrincipal("bob")); @@ -143,7 +144,7 @@ public class StormRangerAuthorizerTest { } @Ignore - @org.junit.Test + @Test public void testTopologyRebalancing() throws Exception { final Subject subject = new Subject(); subject.getPrincipals().add(new SimplePrincipal("bob"));
