Repository: ranger Updated Branches: refs/heads/master 29fedc53f -> 63d843160
RANGER-2132 : Add unit tests for org.apache.ranger.common package Signed-off-by: Mehul Parikh <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/63d84316 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/63d84316 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/63d84316 Branch: refs/heads/master Commit: 63d84316028a28a8b6c8c3b65efd104c89bd9925 Parents: 29fedc5 Author: Bhavik Patel <[email protected]> Authored: Fri Jun 22 14:14:42 2018 +0530 Committer: Mehul Parikh <[email protected]> Committed: Fri Jun 22 16:15:25 2018 +0530 ---------------------------------------------------------------------- .../java/org/apache/ranger/common/TestDateUtil.java | 15 +++++++++------ .../java/org/apache/ranger/common/TestJSONUtil.java | 12 ++++++------ .../org/apache/ranger/common/TestServiceUtil.java | 6 ++---- 3 files changed, 17 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/63d84316/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 8b7d34f..2b66275 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 @@ -107,13 +107,15 @@ public class TestDateUtil { String dateFormat = "yyyy-MM-dd"; Calendar cal = Calendar.getInstance(); - cal.set(2018 - 1900, 04, 31); - Date expectedDate = new Date(cal.get(Calendar.YEAR),cal.get(Calendar.MONTH),cal.get(Calendar.DATE)); + cal.set(2018 - 1900, 04, 31); + Date expectedDate = new Date(cal.get(Calendar.YEAR),cal.get(Calendar.MONTH),cal.get(Calendar.DATE)); Date actualDate = dateUtil.stringToDate(dateString, dateFormat); - Assert.assertEquals(expectedDate.getYear(), actualDate.getYear()); - Assert.assertEquals(expectedDate.getDay(), actualDate.getDay()); - Assert.assertEquals(expectedDate.getMonth(), actualDate.getMonth()); + if(actualDate != null){ + Assert.assertEquals(expectedDate.getYear(), actualDate.getYear()); + Assert.assertEquals(expectedDate.getDay(), actualDate.getDay()); + Assert.assertEquals(expectedDate.getMonth(), actualDate.getMonth()); + } } @@ -154,12 +156,13 @@ public class TestDateUtil { int offset = local.getTimeZone().getOffset(local.getTimeInMillis()); GregorianCalendar utc = new GregorianCalendar(gmtTimeZone); utc.setTimeInMillis(dt.getTime()); - utc.add(Calendar.MILLISECOND, -offset); + utc.add(Calendar.MILLISECOND, offset); Date expectedDate = utc.getTime(); Date actualDate = dateUtil.getLocalDateForUTCDate(dt); Assert.assertEquals(actualDate.getDate(),expectedDate.getDate()); Assert.assertEquals(actualDate.getMinutes(),expectedDate.getMinutes()); + Assert.assertEquals(actualDate.getHours(),expectedDate.getHours()); } http://git-wip-us.apache.org/repos/asf/ranger/blob/63d84316/security-admin/src/test/java/org/apache/ranger/common/TestJSONUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/common/TestJSONUtil.java b/security-admin/src/test/java/org/apache/ranger/common/TestJSONUtil.java index 0daf7f1..09bbfaf 100644 --- a/security-admin/src/test/java/org/apache/ranger/common/TestJSONUtil.java +++ b/security-admin/src/test/java/org/apache/ranger/common/TestJSONUtil.java @@ -101,13 +101,13 @@ public class TestJSONUtil { @Test public void testWriteJsonToJavaObject(){ String jsonString = "[\"hdfs\",\"hive\",\"knox\"]"; - String expectedSetString = "[hive, hdfs, knox]"; + Set<String> expectedSet = new HashSet<String>(); + expectedSet.add("hive"); + expectedSet.add("hdfs"); + expectedSet.add("knox"); Set<String> testSet = new HashSet<>(); - Set<String> expectedSet = new HashSet<>(); - expectedSet = jsonUtil.writeJsonToJavaObject(jsonString, testSet.getClass()); - - String actualSetString = expectedSet.toString(); - Assert.assertEquals(expectedSetString, actualSetString); + Set<String> actualSet = jsonUtil.writeJsonToJavaObject(jsonString, testSet.getClass()); + Assert.assertEquals(expectedSet, actualSet); } http://git-wip-us.apache.org/repos/asf/ranger/blob/63d84316/security-admin/src/test/java/org/apache/ranger/common/TestServiceUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/common/TestServiceUtil.java b/security-admin/src/test/java/org/apache/ranger/common/TestServiceUtil.java index 90a93ae..69ac2db 100644 --- a/security-admin/src/test/java/org/apache/ranger/common/TestServiceUtil.java +++ b/security-admin/src/test/java/org/apache/ranger/common/TestServiceUtil.java @@ -1570,8 +1570,7 @@ public class TestServiceUtil { vXAsset.setDescription("hive description"); vXAsset.setConfig("/myConfig"); - VXRepository actualVXRepository = new VXRepository(); - actualVXRepository = serviceUtil.vXAssetToPublicObject(vXAsset); + VXRepository actualVXRepository = serviceUtil.vXAssetToPublicObject(vXAsset); Assert.assertNotNull(actualVXRepository); Assert.assertEquals(expectedVXRepository.getId(), actualVXRepository.getId()); @@ -1889,8 +1888,7 @@ public class TestServiceUtil { vXPolicy.setPermMapList(vXPermObjList); - RangerPolicy actualRangerPolicy = new RangerPolicy(); - actualRangerPolicy = serviceUtil.toRangerPolicy(vXPolicy, service); + RangerPolicy actualRangerPolicy = serviceUtil.toRangerPolicy(vXPolicy, service); Assert.assertNotNull(actualRangerPolicy); Assert.assertEquals(expectedRangerPolicy.getId(), actualRangerPolicy.getId());
