This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch atlas-2.5
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/atlas-2.5 by this push:
new cac706aa0 ATLAS-5245: fix unittest failures in
EntitySearchProcessorTest (#574)
cac706aa0 is described below
commit cac706aa0cc5513d0976dab5cac6d33d4a61f30c
Author: Madhan Neethiraj <[email protected]>
AuthorDate: Mon Mar 23 10:47:22 2026 -0700
ATLAS-5245: fix unittest failures in EntitySearchProcessorTest (#574)
(cherry picked from commit 6d418eded67f3566acb5847d39d182594316adad)
---
.../atlas/discovery/EntitySearchProcessorTest.java | 57 ++++++++++++----------
1 file changed, 31 insertions(+), 26 deletions(-)
diff --git
a/repository/src/test/java/org/apache/atlas/discovery/EntitySearchProcessorTest.java
b/repository/src/test/java/org/apache/atlas/discovery/EntitySearchProcessorTest.java
index 25ecdb81d..bb5056d8e 100644
---
a/repository/src/test/java/org/apache/atlas/discovery/EntitySearchProcessorTest.java
+++
b/repository/src/test/java/org/apache/atlas/discovery/EntitySearchProcessorTest.java
@@ -51,7 +51,6 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
-import java.util.GregorianCalendar;
import java.util.List;
import java.util.TimeZone;
import java.util.stream.Collectors;
@@ -67,6 +66,7 @@ public class EntitySearchProcessorTest extends BasicTestSetup
{
private static final SimpleDateFormat FORMATTED_DATE = new
SimpleDateFormat("dd-MMM-yyyy");
private static final String EXPECTED_ENTITY_NAME =
"hive_Table_Null_tableType";
+ private static final TimeZone TIME_ZONE_UTC =
TimeZone.getTimeZone("UTC");
@Inject
public GraphBackedSearchIndexer indexer;
@@ -90,7 +90,7 @@ public class EntitySearchProcessorTest extends BasicTestSetup
{
setupTestData();
createJapaneseEntityWithDescription();
createChineseEntityWithDescription();
- FORMATTED_DATE.setTimeZone(TimeZone.getTimeZone("UTC"));
+ FORMATTED_DATE.setTimeZone(TIME_ZONE_UTC);
}
@Test
@@ -396,10 +396,11 @@ public class EntitySearchProcessorTest extends
BasicTestSetup {
@Test
public void testLast7Days() throws AtlasBaseException {
- SearchParameters.FilterCriteria ret =
filtercriteriaDateRange("LAST_7_DAYS", typeRegistry, graph);
+ SearchParameters.FilterCriteria ret =
filtercriteriaDateRange("LAST_7_DAYS", typeRegistry, graph);
+ Calendar startDate =
Calendar.getInstance(TIME_ZONE_UTC);
+ Calendar endDate =
Calendar.getInstance(TIME_ZONE_UTC);
+
ret.setAttributeName("createTime");
- GregorianCalendar startDate = new GregorianCalendar();
- GregorianCalendar endDate = new GregorianCalendar();
startDate.add(Calendar.DATE, -6);
String[] dates = ret.getAttributeValue().split(",");
@@ -413,8 +414,8 @@ public class EntitySearchProcessorTest extends
BasicTestSetup {
@Test
public void testLastMonth() throws AtlasBaseException {
SearchParameters.FilterCriteria ret =
filtercriteriaDateRange("LAST_MONTH", typeRegistry, graph);
- Calendar originalstartdate =
Calendar.getInstance();
- Calendar originalenddate =
Calendar.getInstance();
+ Calendar originalstartdate =
Calendar.getInstance(TIME_ZONE_UTC);
+ Calendar originalenddate =
Calendar.getInstance(TIME_ZONE_UTC);
originalstartdate.add(Calendar.MONTH, -1);
originalstartdate.set(Calendar.DAY_OF_MONTH,
originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
@@ -432,8 +433,9 @@ public class EntitySearchProcessorTest extends
BasicTestSetup {
@Test
public void testLast30Days() throws AtlasBaseException {
SearchParameters.FilterCriteria ret =
filtercriteriaDateRange("LAST_30_DAYS", typeRegistry, graph);
- GregorianCalendar startDate = new GregorianCalendar();
- GregorianCalendar endDate = new GregorianCalendar();
+ Calendar startDate =
Calendar.getInstance(TIME_ZONE_UTC);
+ Calendar endDate =
Calendar.getInstance(TIME_ZONE_UTC);
+
startDate.add(Calendar.DATE, -29);
String[] dates = ret.getAttributeValue().split(",");
@@ -447,7 +449,8 @@ public class EntitySearchProcessorTest extends
BasicTestSetup {
@Test
public void testYesterday() throws AtlasBaseException {
SearchParameters.FilterCriteria ret =
filtercriteriaDateRange("YESTERDAY", typeRegistry, graph);
- GregorianCalendar yesterdayDate = new
GregorianCalendar();
+ Calendar yesterdayDate =
Calendar.getInstance(TIME_ZONE_UTC);
+
yesterdayDate.add(Calendar.DATE, -1);
String[] dates = ret.getAttributeValue().split(",");
@@ -459,8 +462,8 @@ public class EntitySearchProcessorTest extends
BasicTestSetup {
@Test
public void testThisMonth() throws AtlasBaseException {
SearchParameters.FilterCriteria ret =
filtercriteriaDateRange("THIS_MONTH", typeRegistry, graph);
- Calendar originalstartdate =
Calendar.getInstance();
- Calendar originalenddate =
Calendar.getInstance();
+ Calendar originalstartdate =
Calendar.getInstance(TIME_ZONE_UTC);
+ Calendar originalenddate =
Calendar.getInstance(TIME_ZONE_UTC);
originalstartdate.set(Calendar.DAY_OF_MONTH,
originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
originalenddate.set(Calendar.DAY_OF_MONTH,
originalenddate.getActualMaximum(Calendar.DAY_OF_MONTH));
@@ -476,8 +479,9 @@ public class EntitySearchProcessorTest extends
BasicTestSetup {
@Test
public void testThisQuarter() throws AtlasBaseException {
SearchParameters.FilterCriteria ret =
filtercriteriaDateRange("THIS_QUARTER", typeRegistry, graph);
- Calendar originalstartdate =
Calendar.getInstance();
- Calendar originalenddate =
Calendar.getInstance();
+ Calendar originalstartdate =
Calendar.getInstance(TIME_ZONE_UTC);
+ Calendar originalenddate =
Calendar.getInstance(TIME_ZONE_UTC);
+
originalstartdate.add(Calendar.MONTH, -1);
originalstartdate.set(Calendar.DAY_OF_MONTH,
originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
originalenddate.add(Calendar.MONTH, 1);
@@ -494,8 +498,9 @@ public class EntitySearchProcessorTest extends
BasicTestSetup {
@Test
public void testLastQuarter() throws AtlasBaseException {
SearchParameters.FilterCriteria ret =
filtercriteriaDateRange("LAST_QUARTER", typeRegistry, graph);
- Calendar originalstartdate =
Calendar.getInstance();
- Calendar originalenddate =
Calendar.getInstance();
+ Calendar originalstartdate =
Calendar.getInstance(TIME_ZONE_UTC);
+ Calendar originalenddate =
Calendar.getInstance(TIME_ZONE_UTC);
+
originalstartdate.add(Calendar.MONTH, -4);
originalstartdate.set(Calendar.DAY_OF_MONTH,
originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
originalenddate.add(Calendar.MONTH, -2);
@@ -512,8 +517,8 @@ public class EntitySearchProcessorTest extends
BasicTestSetup {
@Test
public void testLast3Months() throws AtlasBaseException {
SearchParameters.FilterCriteria ret =
filtercriteriaDateRange("LAST_3_MONTHS", typeRegistry, graph);
- Calendar originalstartdate =
Calendar.getInstance();
- Calendar originalenddate =
Calendar.getInstance();
+ Calendar originalstartdate =
Calendar.getInstance(TIME_ZONE_UTC);
+ Calendar originalenddate =
Calendar.getInstance(TIME_ZONE_UTC);
originalstartdate.add(Calendar.MONTH, -3);
originalstartdate.set(Calendar.DAY_OF_MONTH,
originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
@@ -531,8 +536,8 @@ public class EntitySearchProcessorTest extends
BasicTestSetup {
@Test
public void testThisYear() throws AtlasBaseException {
SearchParameters.FilterCriteria ret =
filtercriteriaDateRange("THIS_YEAR", typeRegistry, graph);
- Calendar originalstartdate =
Calendar.getInstance();
- Calendar originalenddate =
Calendar.getInstance();
+ Calendar originalstartdate =
Calendar.getInstance(TIME_ZONE_UTC);
+ Calendar originalenddate =
Calendar.getInstance(TIME_ZONE_UTC);
originalstartdate.set(Calendar.MONTH, 0);
originalstartdate.set(Calendar.DAY_OF_MONTH,
originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
@@ -551,8 +556,8 @@ public class EntitySearchProcessorTest extends
BasicTestSetup {
@Test
public void testLastYear() throws AtlasBaseException {
SearchParameters.FilterCriteria ret =
filtercriteriaDateRange("LAST_YEAR", typeRegistry, graph);
- Calendar originalstartdate =
Calendar.getInstance();
- Calendar originalenddate =
Calendar.getInstance();
+ Calendar originalstartdate =
Calendar.getInstance(TIME_ZONE_UTC);
+ Calendar originalenddate =
Calendar.getInstance(TIME_ZONE_UTC);
originalstartdate.add(Calendar.YEAR, -1);
originalstartdate.set(Calendar.MONTH, 0);
@@ -573,8 +578,8 @@ public class EntitySearchProcessorTest extends
BasicTestSetup {
@Test
public void testLast12Months() throws AtlasBaseException {
SearchParameters.FilterCriteria ret =
filtercriteriaDateRange("LAST_12_MONTHS", typeRegistry, graph);
- Calendar originalstartdate =
Calendar.getInstance();
- Calendar originalenddate =
Calendar.getInstance();
+ Calendar originalstartdate =
Calendar.getInstance(TIME_ZONE_UTC);
+ Calendar originalenddate =
Calendar.getInstance(TIME_ZONE_UTC);
originalstartdate.add(Calendar.MONTH, -12);
originalstartdate.set(Calendar.DAY_OF_MONTH,
originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
@@ -593,8 +598,8 @@ public class EntitySearchProcessorTest extends
BasicTestSetup {
@Test
public void testLast6Months() throws AtlasBaseException {
SearchParameters.FilterCriteria ret =
filtercriteriaDateRange("LAST_6_MONTHS", typeRegistry, graph);
- Calendar originalstartdate =
Calendar.getInstance();
- Calendar originalenddate =
Calendar.getInstance();
+ Calendar originalstartdate =
Calendar.getInstance(TIME_ZONE_UTC);
+ Calendar originalenddate =
Calendar.getInstance(TIME_ZONE_UTC);
originalstartdate.add(Calendar.MONTH, -6);
originalstartdate.set(Calendar.DAY_OF_MONTH,
originalstartdate.getActualMinimum(Calendar.DAY_OF_MONTH));
